Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170

[awesomized/libmemcached] / libmemcached / common.h

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 810886326d1c3842c4d4a85c8ff50bbf4042e6cc..cc38b56d49f42e9d9409750ec8830bcfdbb7036d 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -42,7 +42,7 @@
 
 #pragma once
 
-#include <config.h>
+#include <mem_config.h>
 
 #ifdef __cplusplus
 # include <cstddef>
@@ -111,7 +111,9 @@
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
 
-#include <libmemcached/instance.h>
+#ifdef __cplusplus
+# include "libmemcached/instance.hpp"
+#endif
 #include <libmemcached/server_instance.h>
 
 #ifdef HAVE_POLL_H