From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 13 Jan 2010 22:44:59 +0000 (-0800)
Subject: Protected stdbool.h from being included by C++, which is invalid on Sun Studio.
X-Git-Tag: 0.40~115^2~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f5c167f523682cb08109842ce010b29e80fdf63d;p=m6w6%2Flibmemcached

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 51023d9d..87caca5d 100644
--- 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 610f3bc5..c4917d11 100644
--- 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 48782a0c..1d29798c 100644
--- 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 3fb00c98..3e4531bb 100644
--- 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 fc10c8d5..cf190572 100644
--- 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;