X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemory.h;h=12d02849124263cce017a35ee6a054d2c101c22f;hb=6dcb8a43e1380354fea76a5a412dce2592bcc605;hp=3d5faf8a243fb4930e4fc79b0f7c9a0c435bdc3a;hpb=69e4ae10dc2c3d30f74db2c7f18dee16a7cedaef;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index 3d5faf8a..12d02849 100644
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -36,12 +36,13 @@
 
 #pragma once
 
-#include <libmemcached-1.0/struct/memcached.h>
+#include <mem_config.h>
+
+#include <libmemcached/common.h>
 
 #ifdef __cplusplus
 #include <cstddef>
 #include <cstdlib>
-#include <memory>
 #else
 #include <stddef.h>
 #include <stdlib.h>
@@ -86,9 +87,9 @@ static inline void *libmemcached_realloc(const memcached_st *self, void *mem, si
   }
 
 #ifdef __cplusplus
-  return std::realloc(mem, size);
+    return std::realloc(mem, size);
 #else
-  return realloc(mem, size);
+    return realloc(mem, size);
 #endif
 }
 #define libmemcached_xrealloc(__memcachd_st, __mem, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), (__mem), (__nelem), sizeof(__type)))
@@ -102,9 +103,9 @@ static inline void *libmemcached_calloc(const memcached_st *self, size_t nelem,
   }
 
 #ifdef __cplusplus
-  return std::calloc(nelem, size);
+    return std::calloc(nelem, size);
 #else
-  return calloc(nelem, size);
+    return calloc(nelem, size);
 #endif
 }
 #define libmemcached_xcalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_calloc((__memcachd_st), (__nelem), sizeof(__type)))