Merge in simple extrace for strings, style issues in io

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index d4b2c7df3446660f26307541ec29a3560068767d..49d309c8759ed0a2a8e7f2f788bb2b03eda02203 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -92,7 +92,11 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
 #include <libmemcached/error.hpp>
 #include <libmemcached/memory.h>
 #include <libmemcached/io.h>
+#ifdef __cplusplus
+#include <libmemcached/string.hpp>
+#include <libmemcached/io.hpp>
 #include <libmemcached/do.hpp>
+#endif
 #include <libmemcached/internal.h>
 #include <libmemcached/array.h>
 #include <libmemcached/libmemcached_probes.h>