Actually, move EVUTIL_NIL_STMT to util-internal.h

svn:r1135
This commit is contained in:
Nick Mathewson 2009-04-05 04:10:05 +00:00
parent 60e0d59b33
commit 661b5eea09
2 changed files with 11 additions and 13 deletions

View File

@ -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

View File

@ -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