X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemory.h;h=12d02849124263cce017a35ee6a054d2c101c22f;hb=f00605dce4a482c8b19ef17c0e79c31238498522;hp=e59eabbea9c21412d2c892e906746f1e50d72374;hpb=6e50e7a48d1230946aa73d42d47e89307d716b6b;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memory.h b/libmemcached/memory.h
index e59eabbe..12d02849 100644
--- a/libmemcached/memory.h
+++ b/libmemcached/memory.h
@@ -36,7 +36,17 @@
 
 #pragma once
 
-#include <libmemcached-1.0/struct/memcached.h>
+#include <mem_config.h>
+
+#include <libmemcached/common.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)
 {
@@ -46,7 +56,11 @@ static inline void libmemcached_free(const memcached_st *self, void *mem)
   }
   else if (mem)
   {
+#ifdef __cplusplus
+    std::free(mem);
+#else
     free(mem);
+#endif
   }
 }
 
@@ -57,7 +71,11 @@ static inline void *libmemcached_malloc(const memcached_st *self, const size_t s
     return self->allocators.malloc(self, size, self->allocators.context);
   }
 
+#ifdef __cplusplus
+  return std::malloc(size);
+#else
   return malloc(size);
+#endif
 }
 #define libmemcached_xmalloc(__memcachd_st, __type) ((__type *)libmemcached_malloc((__memcachd_st), sizeof(__type)))
 
@@ -68,7 +86,11 @@ static inline void *libmemcached_realloc(const memcached_st *self, void *mem, si
     return self->allocators.realloc(self, mem, nmemb * size, self->allocators.context);
   }
 
-  return realloc(mem, size);
+#ifdef __cplusplus
+    return std::realloc(mem, size);
+#else
+    return realloc(mem, size);
+#endif
 }
 #define libmemcached_xrealloc(__memcachd_st, __mem, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), (__mem), (__nelem), sizeof(__type)))
 #define libmemcached_xvalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_realloc((__memcachd_st), NULL, (__nelem), sizeof(__type)))
@@ -80,6 +102,10 @@ static inline void *libmemcached_calloc(const memcached_st *self, size_t nelem,
     return self->allocators.calloc(self, nelem, size, self->allocators.context);
   }
 
-  return calloc(nelem, size);
+#ifdef __cplusplus
+    return std::calloc(nelem, size);
+#else
+    return calloc(nelem, size);
+#endif
 }
 #define libmemcached_xcalloc(__memcachd_st, __nelem, __type) ((__type *)libmemcached_calloc((__memcachd_st), (__nelem), sizeof(__type)))