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 e98d33bf20b5cc51b4cb9bba85cb9c9ba50bdcb1..cfc4705a0d493f29d3a6b08ef855b4a5d1e144e5 100644 (file)
--- 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 fa1f63bb4781cd7f40d38a03f60e3a83d990c1d9..56f0114a250a4ce4e8552dfea3b51a07f0b5a864 100644 (file)
--- 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