diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/k5-thread.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 7bde94f66..197468696 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,5 +1,10 @@ 2004-07-11 Ken Raeburn <raeburn@mit.edu> + * k5-thread.h (k5_os_mutex_lock, k5_os_mutex_unlock, + k5_os_mutex_assert_locked, k5_os_mutex_assert_unlocked) + [USE_PTHREAD_LOCK_ONLY_IF_LOADED]: Fix typo in accessing + non-pthread versions. + * configure.in: Check krb5_cv_inet6_with_dinet6 as well as krb5_cv_inet6 when deciding whether to test for in6addr_any. If gcc is in use, suppress pedantic warnings about "inline". diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h index 941073128..4d1a6fca5 100644 --- a/src/include/k5-thread.h +++ b/src/include/k5-thread.h @@ -426,20 +426,20 @@ typedef struct { # define k5_os_mutex_lock(M) \ (K5_PTHREADS_LOADED \ ? pthread_mutex_lock(&(M)->p) \ - : k5_os_nothread_lock(&(M)->n)) + : k5_os_nothread_mutex_lock(&(M)->n)) # define k5_os_mutex_unlock(M) \ (K5_PTHREADS_LOADED \ ? pthread_mutex_unlock(&(M)->p) \ - : k5_os_nothread_unlock(&(M)->n)) + : k5_os_nothread_mutex_unlock(&(M)->n)) # define k5_os_mutex_assert_unlocked(M) \ (K5_PTHREADS_LOADED \ ? k5_pthread_assert_unlocked(&(M)->p) \ - : k5_os_nothread_assert_unlocked(&(M)->n)) + : k5_os_nothread_mutex_assert_unlocked(&(M)->n)) # define k5_os_mutex_assert_locked(M) \ (K5_PTHREADS_LOADED \ ? k5_pthread_assert_locked(&(M)->p) \ - : k5_os_nothread_assert_locked(&(M)->n)) + : k5_os_nothread_mutex_assert_locked(&(M)->n)) #else |