Merge remote-tracking branch 'core/engine-pu' into branch-20

* core/engine-pu: Don't include stdbool.h when included from C++
mikewied · Aug 12, 2011 · 091c322 · 091c322
2 parents fa613ad + bbafc07
commit 091c322
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/include/memcached/engine.h b/include/memcached/engine.h
@@ -2,8 +2,11 @@
 #ifndef MEMCACHED_ENGINE_H
 #define MEMCACHED_ENGINE_H
 
-#include <sys/types.h>
+#ifndef __cplusplus
 #include <stdbool.h>
+#endif
+
+#include <sys/types.h>
 #include <stdint.h>
 #include <stdio.h>
 

diff --git a/include/memcached/extension.h b/include/memcached/extension.h
@@ -2,7 +2,10 @@
 #ifndef MEMCACHED_EXTENSION_H
 #define MEMCACHED_EXTENSION_H
 
+#ifndef __cplusplus
 #include <stdbool.h>
+#endif
+
 #include <stdint.h>
 #include <memcached/engine_common.h>
 #include <memcached/protocol_binary.h>

diff --git a/include/memcached/types.h b/include/memcached/types.h
@@ -2,9 +2,12 @@
 #define MEMCACHED_TYPES_H 1
 
 #include <sys/types.h>
-#include <stdbool.h>
 #include <stdint.h>
 
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
 #ifdef __WIN32__
 struct iovec {
     size_t iov_len;