From b6711c26123ac2541ca9e692141374a91d19a2f9 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 15 Aug 2004 03:37:24 +0000 Subject: [PATCH] Fix Tru64 build: * k5-thread.h (k5_os_nothread_mutex_assert_locked, k5_os_nothread_mutex_assert_unlocked, k5_os_mutex_assert_locked, k5_os_mutex_assert_unlocked): Assertion macros should always have type void. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16663 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/ChangeLog | 7 +++++++ src/include/k5-thread.h | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index e3243df77..f92a08ce8 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,10 @@ +2004-08-14 Ken Raeburn + + * k5-thread.h (k5_os_nothread_mutex_assert_locked, + k5_os_nothread_mutex_assert_unlocked, k5_os_mutex_assert_locked, + k5_os_mutex_assert_unlocked): Assertion macros should always have + type void. + 2004-08-12 Ken Raeburn * k5-thread.h (k5_os_nothread_mutex_finish_init, diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h index 63dbcbfb4..5d1309310 100644 --- a/src/include/k5-thread.h +++ b/src/include/k5-thread.h @@ -272,11 +272,11 @@ typedef struct { # define k5_os_nothread_mutex_assert_locked(M) \ (assert((M)->initialized == K5_MUTEX_DEBUG_INITIALIZED), \ assert((M)->locked != K5_MUTEX_DEBUG_UNLOCKED), \ - assert((M)->locked == K5_MUTEX_DEBUG_LOCKED), 0) + assert((M)->locked == K5_MUTEX_DEBUG_LOCKED)) # define k5_os_nothread_mutex_assert_unlocked(M) \ (assert((M)->initialized == K5_MUTEX_DEBUG_INITIALIZED), \ assert((M)->locked != K5_MUTEX_DEBUG_LOCKED), \ - assert((M)->locked == K5_MUTEX_DEBUG_UNLOCKED), 0) + assert((M)->locked == K5_MUTEX_DEBUG_UNLOCKED)) #else /* threads disabled and not debugging */ @@ -300,8 +300,8 @@ static inline int k5_os_nothread_mutex_lock(k5_os_nothread_mutex *m) { static inline int k5_os_nothread_mutex_unlock(k5_os_nothread_mutex *m) { return 0; } -# define k5_os_nothread_mutex_assert_locked(M) (0) -# define k5_os_nothread_mutex_assert_unlocked(M) (0) +# define k5_os_nothread_mutex_assert_locked(M) ((void)0) +# define k5_os_nothread_mutex_assert_unlocked(M) ((void(0) #endif @@ -563,8 +563,8 @@ static inline int k5_os_mutex_lock(k5_os_mutex *m) (M)->is_locked = 0, \ ReleaseMutex((M)->h) ? 0 : GetLastError()) -# define k5_os_mutex_assert_unlocked(M) (0) -# define k5_os_mutex_assert_locked(M) (0) +# define k5_os_mutex_assert_unlocked(M) ((void)0) +# define k5_os_mutex_assert_locked(M) ((void)0) #else -- 2.26.2