Fix buildworld with -DNDEBUG in CFLAGS.

ANSI C requires that if NDEBUG is defined, assert(3) shall be disabled,
that is, defined "((void)0)".

The usage of NDEBUG in libevent is not related to assert(3), so simply
remove the #ifdef's (as was done upstream in later versions of
libevent).

diff --git a/contrib/libevent/evdns.c b/contrib/libevent/evdns.c
index 1fc2075..a052668 100644 (file)
--- a/contrib/libevent/evdns.c
+++ b/contrib/libevent/evdns.c
@@ -43,8 +43,6 @@
 #include "misc.h"
 #endif
 
-/* #define NDEBUG */
-
 #ifndef DNS_USE_CPU_CLOCK_FOR_ID
 #ifndef DNS_USE_GETTIMEOFDAY_FOR_ID
 #ifndef DNS_USE_OPENSSL_FOR_ID
@@ -120,9 +118,7 @@ typedef int socklen_t;
 #define HOST_NAME_MAX 255
 #endif
 
-#ifndef NDEBUG
 #include <stdio.h>
-#endif
 
 #undef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
@@ -373,7 +369,6 @@ inet_aton(const char *c, struct in_addr *addr)
 #define ISSPACE(c) isspace((int)(unsigned char)(c))
 #define ISDIGIT(c) isdigit((int)(unsigned char)(c))
 
-#ifndef NDEBUG
 static const char *
 debug_ntoa(u32 address)
 {
@@ -386,7 +381,6 @@ debug_ntoa(u32 address)
                      (int)(u8)((a    )&0xff));
        return buf;
 }
-#endif
 
 static evdns_debug_log_fn_type evdns_log_fn = NULL;