From: Tom Yu Date: Mon, 24 Jan 2005 20:46:41 +0000 (+0000) Subject: pullup from trunk X-Git-Tag: krb5-1.4.3-beta1~94 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2b92f9b1b5efe4b4a0dbcd54011096dcabc5969;p=krb5.git pullup from trunk ticket: 2893 version_fixed: 1.4 target_version: 1.4 component: krb5-libs git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17064 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/ChangeLog b/src/include/ChangeLog index b159b282f..a52995d31 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,11 @@ +2005-01-21 Ezra Peisach + + * k5-thread.h (k5_os_mutex_lock): Under Irix, invoke + k5_pthread_mutex_lock() with the k5_os_mutex, not the + pthread_mutex_t. + (k5_pthread_assert_locked,unlocked): If DEBUG_THREADS not use, provide + correct prototype. Add missing close paren. + 2005-01-14 Ken Raeburn * k5-thread.h [HAVE_PTHREAD && HAVE_PRAGMA_WEAK_REF]: Mark diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h index 210562458..9ac5219f4 100644 --- a/src/include/k5-thread.h +++ b/src/include/k5-thread.h @@ -301,7 +301,7 @@ static inline int k5_os_nothread_mutex_unlock(k5_os_nothread_mutex *m) { return 0; } # define k5_os_nothread_mutex_assert_locked(M) ((void)0) -# define k5_os_nothread_mutex_assert_unlocked(M) ((void(0) +# define k5_os_nothread_mutex_assert_unlocked(M) ((void)0) #endif @@ -463,7 +463,7 @@ k5_pthread_mutex_lock(k5_os_mutex *m) pthread_mutex_unlock(&(M)->p)) #else # define k5_pthread_mutex_lock(M) pthread_mutex_lock(&(M)->p) -static inline void k5_pthread_assert_locked(pthread_mutex_t *m) { } +static inline void k5_pthread_assert_locked(k5_os_mutex *m) { } # define k5_pthread_mutex_unlock(M) pthread_mutex_unlock(&(M)->p) #endif @@ -547,7 +547,7 @@ static inline int return_after_yield(int r) # define k5_os_mutex_lock(M) \ return_after_yield(K5_PTHREADS_LOADED \ - ? k5_pthread_mutex_lock(&(M)->p) \ + ? k5_pthread_mutex_lock(M) \ : k5_os_nothread_mutex_lock(&(M)->n)) # define k5_os_mutex_unlock(M) \ (MAYBE_SCHED_YIELD(), \