From fed759289b7835fcf310cd0e940fed56962aa9ba Mon Sep 17 00:00:00 2001 From: Date: Sun, 20 Apr 2008 15:49:37 -0700 Subject: [PATCH] Sensei reported a bug with assert.h being included multiple times. Occurs on CentOS 5 --- clients/utilities.h | 1 - libmemcached/common.h | 1 - libmemcached/memcached_watchpoint.h | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/utilities.h b/clients/utilities.h index b35f03ef..ea0be2ea 100644 --- a/clients/utilities.h +++ b/clients/utilities.h @@ -1,5 +1,4 @@ #include -#include #include #include "client_options.h" diff --git a/libmemcached/common.h b/libmemcached/common.h index de55dbbe..81abd72c 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/libmemcached/memcached_watchpoint.h b/libmemcached/memcached_watchpoint.h index b0270b61..e87b0b04 100644 --- 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 + #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); -- 2.30.2