diff options
| -rw-r--r-- | buffer.c | 6 | ||||
| -rw-r--r-- | util-internal.h | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -246,6 +246,12 @@ evbuffer_chains_all_empty(struct evbuffer_chain *chain) } return 1; } +#else +/* The definition is needed for EVUTIL_ASSERT, which uses sizeof to avoid +"unused variable" warnings. */ +static inline int evbuffer_chains_all_empty(struct evbuffer_chain *chain) { + return 1; +} #endif static void diff --git a/util-internal.h b/util-internal.h index 73cd8f8c..cb76ee4f 100644 --- a/util-internal.h +++ b/util-internal.h @@ -52,6 +52,10 @@ extern "C" { /* A good no-op to use in macro definitions. */ #define _EVUTIL_NIL_STMT ((void)0) +/* Suppresses the compiler's "unused variable" warnings for unused assert. */ +#define _EVUTIL_NIL_CONDITION(condition) do { \ + (void)sizeof(condition); \ +} while(0) /* Internal use only: macros to match patterns of error codes in a cross-platform way. We need these macros because of two historical @@ -177,7 +181,7 @@ long _evutil_weakrand(void); /* Replacement for assert() that calls event_errx on failure. */ #ifdef NDEBUG -#define EVUTIL_ASSERT(cond) _EVUTIL_NIL_STMT +#define EVUTIL_ASSERT(cond) _EVUTIL_NIL_CONDITION(cond) #define EVUTIL_FAILURE_CHECK(cond) 0 #else #define EVUTIL_ASSERT(cond) \ |