Merge working tree with build tree.

[m6w6/libmemcached] / libmemcached / memory.h

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index 89ad6984b70ce6b39fe93a44dc15da04fffbbc12..dd0092370aa7e35e21455f06885f8c1fa5f71458 100644 (file)
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -36,6 +36,16 @@
 
 #pragma once
 
+#include <libmemcached-1.0/struct/memcached.h>
+
+#ifdef __cplusplus
+#include <cstddef>
+#include <cstdlib>
+#else
+#include <stddef.h>
+#include <stdlib.h>
+#endif
+
 static inline void libmemcached_free(const memcached_st *self, void *mem)
 {
   if (self)