Fix build with thread support disabled, and make no-op macros a little more no-oppy.

svn:r1133

diff --git a/evthread-internal.h b/evthread-internal.h
index 1b803b1d9b80b756b75b09cec42c3afc6f0ba744..4a3c515afa2390987b555d56a09a42b29502ab7b 100644 (file)
--- a/evthread-internal.h
+++ b/evthread-internal.h
@@ -112,13 +112,25 @@ extern void (*_evthread_lock_free_fn)(void *);
                            (base)->lock);                              \
        } while (0)
 #else /* _EVENT_DISABLE_THREAD_SUPPORT */
+
+/* No-op statement. */
+#define _EV_NIL_STMT ((void)0)
+
 #define EVTHREAD_GET_ID()      1
-#define EVTHREAD_ALLOC_LOCK(lockvar)
-#define EVTHREAD_FREE_LOCK(lockvar)
+#define EVTHREAD_ALLOC_LOCK(lockvar) _EV_NIL_STMT
+#define EVTHREAD_FREE_LOCK(lockvar) _EV_NIL_STMT
+
+#define EVLOCK_LOCK(lockvar, mode) _EV_NIL_STMT
+#define EVLOCK_UNLOCK(lockvar, mode) _EV_NIL_STMT
+#define EVLOCK_LOCK2(lock1,lock2,mode1,mode2) _EV_NIL_STMT
+#define EVLOCK_UNLOCK2(lock1,lock2,mode1,mode2) _EV_NIL_STMT
+
+#define EVBASE_IN_THREAD(base) 1
+#define EVBASE_ACQUIRE_LOCK(base, mode, lock) _EV_NIL_STMT
+#define EVBASE_RELEASE_LOCK(base, mode, lock) _EV_NIL_STMT
+
+#undef _EV_NIL_STMT
 
-#define EVBASE_IN_THREAD()     1
-#define EVBASE_ACQUIRE_LOCK(base, mode, lock)
-#define EVBASE_RELEASE_LOCK(base, mode, lock)
 #endif
 
 #ifdef __cplusplus