From 661b5eea092920dcb316f8e1b4b0843096c707c7 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 5 Apr 2009 04:10:05 +0000
Subject: [PATCH] Actually, move EVUTIL_NIL_STMT to util-internal.h

svn:r1135
---
 evthread-internal.h | 21 ++++++++-------------
 util-internal.h     |  3 +++
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/evthread-internal.h b/evthread-internal.h
index 4a3c515a..2f0080a8 100644
--- a/evthread-internal.h
+++ b/evthread-internal.h
@@ -113,23 +113,18 @@ extern void (*_evthread_lock_free_fn)(void *);
 	} 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) _EV_NIL_STMT
-#define EVTHREAD_FREE_LOCK(lockvar) _EV_NIL_STMT
+#define EVTHREAD_ALLOC_LOCK(lockvar) _EVUTIL_NIL_STMT
+#define EVTHREAD_FREE_LOCK(lockvar) _EVUTIL_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 EVLOCK_LOCK(lockvar, mode) _EVUTIL_NIL_STMT
+#define EVLOCK_UNLOCK(lockvar, mode) _EVUTIL_NIL_STMT
+#define EVLOCK_LOCK2(lock1,lock2,mode1,mode2) _EVUTIL_NIL_STMT
+#define EVLOCK_UNLOCK2(lock1,lock2,mode1,mode2) _EVUTIL_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_ACQUIRE_LOCK(base, mode, lock) _EVUTIL_NIL_STMT
+#define EVBASE_RELEASE_LOCK(base, mode, lock) _EVUTIL_NIL_STMT
 
 #endif
 
diff --git a/util-internal.h b/util-internal.h
index b429f57e..34ac6870 100644
--- a/util-internal.h
+++ b/util-internal.h
@@ -33,6 +33,9 @@
 extern "C" {
 #endif
 
+/* A good no-op to use in macro definitions. */
+#define _EVUTIL_NIL_STMT ((void)0)
+
 /* Internal use only: macros to match patterns of error codes in a
    cross-platform way.  We need these macros because of two historical
    reasons: first, nonblocking IO functions are generally written to give an