summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/include/ChangeLog5
-rw-r--r--src/include/k5-thread.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 4ba978fc5..e5c7530e8 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-12-07 Ken Raeburn <raeburn@mit.edu>
* k5-thread.h (k5_mutex_lock_update_stats) [__GNUC__]: Use an
diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index ea71bf499..7dbcfac6b 100644
--- a/src/include/k5-thread.h
+++ b/src/include/k5-thread.h
@@ -439,12 +439,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