From: Tom Yu <tlyu@mit.edu>
Date: Wed, 8 Mar 2006 22:17:25 +0000 (+0000)
Subject: pull up r17563 from trunk
X-Git-Tag: kfw-3.1.0-beta1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1713bfaf9040f84106bdb4f361dc2dae1ed14e46;p=krb5.git

pull up r17563 from trunk

ticket: 3293
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17717 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index e98d33bf2..cfc4705a0 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* k5-thread.h (USE_PTHREAD_LOCK_ONLY_IF_LOADED): Define any time
+	HAVE_PRAGMA_WEAK_REF is defined.
+
 2005-10-20  Jeffrey Altman <jaltman@mit.edu>
 
 	* win-mac.h: 
diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index fa1f63bb4..56f0114a2 100644
--- a/src/include/k5-thread.h
+++ b/src/include/k5-thread.h
@@ -400,12 +400,9 @@ extern int krb5int_pthread_loaded(void);
 #   error "Weak reference support is required"
 #  endif
 # endif
-# define USE_PTHREAD_LOCK_ONLY_IF_LOADED
 #endif
 
-#if !defined(HAVE_PTHREAD_MUTEX_LOCK) && !defined(USE_PTHREAD_LOCK_ONLY_IF_LOADED)
-/* If we find a system with a broken stub for pthread_mutex_lock,
-   we may have to change this.  */
+#ifdef HAVE_PRAGMA_WEAK_REF
 # define USE_PTHREAD_LOCK_ONLY_IF_LOADED
 #endif