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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index e3243df7790cd4b4a8236de65bb54c66441a9df6..f92a08ce813633f043c83ff799f35fb10d4fe467 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-14  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * k5-thread.h (k5_os_nothread_mutex_finish_init,

diff --git a/src/include/k5-thread.h b/src/include/k5-thread.h
index 63dbcbfb4a9d0f91b83ab8f1e6bbcbd5f6d480e5..5d1309310209072a7f01f27668a491583cde78cd 100644 (file)
--- 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