Merge Monty

[m6w6/libmemcached] / clients / ms_memslap.h

diff --git a/clients/ms_memslap.h b/clients/ms_memslap.h
index 0b9cc29e2cea1d65a8ebd32e4ab845429c62a305..8777c5bb2466a14419a37b5e6be47699c926adb4 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"