Protected stdbool.h from being included by C++, which is invalid on Sun Studio.

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index 51023d9d2514868722b2f0c3690d7e5f6ae6bbb6..87caca5dc1408ba422c5fec17c7e09ee1520dddd 100644 (file)
--- a/clients/ms_memslap.h
+++ b/clients/ms_memslap.h
@@ -19,7 +19,9 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <pthread.h>
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <math.h>
 
 #include "ms_stats.h"

diff --git a/clients/ms_task.h b/clients/ms_task.h
index 610f3bc55cb5301f9d3522a476bbc577d478d862..c4917d11d7566162cebf4a5474af3ce9951da732 100644 (file)
--- a/clients/ms_task.h
+++ b/clients/ms_task.h
@@ -13,7 +13,9 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <time.h>
 
 #ifdef __cplusplus

diff --git a/libmemcached/protocol/common.h b/libmemcached/protocol/common.h
index 48782a0c735cf85bc00b9b059b8f5e6c4e2a9b44..1d29798c98d5c5b87a7b1861f3e094d2ab6ce43d 100644 (file)
--- a/libmemcached/protocol/common.h
+++ b/libmemcached/protocol/common.h
@@ -3,7 +3,9 @@
 #define LIBMEMCACHED_PROTOCOL_COMMON_H
 
 #include "config.h"
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 #include <assert.h>
 #include <netinet/in.h>
 

diff --git a/libmemcached/protocol_handler.h b/libmemcached/protocol_handler.h
index 3fb00c98d96b4e655232501e9366b5c162bfbfe4..3e4531bb5307a418e76806e756f8516e399db874 100644 (file)
--- a/libmemcached/protocol_handler.h
+++ b/libmemcached/protocol_handler.h
@@ -15,7 +15,9 @@
 #define MEMCACHED_PROTOCOL_H
 
 #include <sys/types.h>
-#include <stdbool.h>
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
 
 #include <libmemcached/memcached/protocol_binary.h>
 #include <libmemcached/visibility.h>

diff --git a/tests/test.h b/tests/test.h
index fc10c8d5492a94bfd28f164e9d28bac39df3fc8c..cf19057250f347c755cb44c4acdd0b4d15a937b8 100644 (file)
--- a/tests/test.h
+++ b/tests/test.h
@@ -16,9 +16,12 @@ extern "C" {
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <stdint.h>
 
+#if !defined(__cplusplus)
+# include <stdbool.h>
+#endif
+
 typedef struct world_st world_st;
 typedef struct collection_st collection_st;
 typedef struct test_st test_st;