Sensei reported a bug with assert.h being included multiple times. Occurs on

CentOS 5

diff --git a/clients/utilities.h b/clients/utilities.h
index b35f03ef10a86e4553e6a58f4196830acb6e13fc..ea0be2ea42234ab55ea7b09c3b320e939001ee79 100644 (file)
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -1,5 +1,4 @@
 #include <getopt.h>
-#include <assert.h>
 #include <libmemcached/memcached.h>
 #include "client_options.h"
 

diff --git a/libmemcached/common.h b/libmemcached/common.h
index de55dbbebfc85bc5ea2375c25503962ad39a5fbf..81abd72c42b64906111b87845f3c2ee2c896958a 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -16,7 +16,6 @@
 #include <netdb.h>
 #include <unistd.h>
 #include <limits.h>
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/un.h>

diff --git a/libmemcached/memcached_watchpoint.h b/libmemcached/memcached_watchpoint.h
index b0270b6177b8d9fda1060ea6f8cb446abb478fdb..e87b0b04f7a5d9d2a0c4a4f5560445600f74ee9c 100644 (file)
--- a/libmemcached/memcached_watchpoint.h
+++ b/libmemcached/memcached_watchpoint.h
@@ -16,6 +16,8 @@ extern "C" {
 /* Some personal debugging functions */
 #ifdef MEMCACHED_INTERNAL 
 #ifdef HAVE_DEBUG
+#include <assert.h>
+
 #define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
 #define WATCHPOINT_ERROR(A) fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);
 #define WATCHPOINT_IFERROR(A) if(A != MEMCACHED_SUCCESS)fprintf(stderr, "\nWATCHPOINT %s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, A));fflush(stdout);