From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 7 Jul 2009 06:05:26 +0000 (-0700)
Subject: Reverted changes to a file that isn't owned by this tree.
X-Git-Tag: 0.31~4^2^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=845f2b33547509bf6dbbb77f54d8901f0ab2d985;p=m6w6%2Flibmemcached

Reverted changes to a file that isn't owned by this tree.
---

diff --git a/libmemcached/memcached/protocol_binary.h b/libmemcached/memcached/protocol_binary.h
index 7a59ade3..08df72e8 100644
--- a/libmemcached/memcached/protocol_binary.h
+++ b/libmemcached/memcached/protocol_binary.h
@@ -32,10 +32,8 @@
  * Author: Trond Norbye <trond.norbye@sun.com>
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H
-#define LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H
-
-#if defined(BUILDING_LIBMEMCACHED)
+#ifndef PROTOCOL_BINARY_H
+#define PROTOCOL_BINARY_H
 
 #include <stdint.h>
 
@@ -360,6 +358,4 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* BUILDING_LIBMEMCACHED */
-#endif /* LIBMEMCACHED_MEMCACHED_PROTOCOL_BINARY_H */
+#endif /* PROTOCOL_BINARY_H */
diff --git a/m4/protocol_binary.m4 b/m4/protocol_binary.m4
index 2c654e4a..d31bcb04 100644
--- a/m4/protocol_binary.m4
+++ b/m4/protocol_binary.m4
@@ -4,7 +4,7 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN([PROTOCOL_BINARY_TEST],
   [AC_LANG_PUSH([C])
    save_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -I${srcdir} -DBUILDING_LIBMEMCACHED"
+   CFLAGS="$CFLAGS -I${srcdir}"
    AC_RUN_IFELSE([ 
       AC_LANG_PROGRAM([[
 #include "libmemcached/memcached/protocol_binary.h"