From:  <brian@gir.tangent.org>
Date: Fri, 2 May 2008 06:01:09 +0000 (-0700)
Subject: Fix for watchpoint macro (Solaris discovery)
X-Git-Tag: _20~1^2~2^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=45cce1e506abfc3cb0df4e6551b7991cff99b33a;p=m6w6%2Flibmemcached

Fix for watchpoint macro (Solaris discovery)
---

diff --git a/ChangeLog b/ChangeLog
index ef18c9fb..eae69e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+  * Fix in watchpoint macro
   * Changed default timeout to 1 second for poll timeouts
   * Wheel uses less memory/dynamic allocation for size (no longer limited to
     512 hosts by default.
diff --git a/libmemcached/memcached_watchpoint.h b/libmemcached/memcached_watchpoint.h
index d61aadfd..10cbdbd8 100644
--- a/libmemcached/memcached_watchpoint.h
+++ b/libmemcached/memcached_watchpoint.h
@@ -14,8 +14,7 @@ extern "C" {
 #endif
 
 /* Some personal debugging functions */
-#ifdef MEMCACHED_INTERNAL 
-#ifdef HAVE_DEBUG
+#if defined(MEMCACHED_INTERNAL) && defined(HAVE_DEBUG)
 #include <assert.h>
 
 #define WATCHPOINT fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
@@ -36,8 +35,8 @@ extern "C" {
 #define WATCHPOINT_ERRNO(A)
 #define WATCHPOINT_ASSERT_PRINT(A,B,C)
 #define WATCHPOINT_ASSERT(A)
-#endif
-#endif /* MEMCACHED_INTERNAL */
+
+#endif /* MEMCACHED_INTERNAL && HAVE_DEBUG */
 
 #ifdef __cplusplus
 }