Merge branch 'master' into brian

[satune.git] / src / mymemory.h

diff --git a/src/mymemory.h b/src/mymemory.h
index 2fa964e6f8031779d21f958f2ae2a2b71d3c3f79..32dfa51b51e8807f6c906ff64d585f08ba099835 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -19,9 +19,16 @@
 
 #include "config.h"
 
+/*
 void * ourmalloc(size_t size);
 void ourfree(void *ptr);
 void * ourcalloc(size_t count, size_t size);
 void * ourrealloc(void *ptr, size_t size);
+*/
+
+static inline void * ourmalloc(size_t size) { return malloc(size); }
+static inline void ourfree(void *ptr) { free(ptr); }
+static inline void * ourcalloc(size_t count, size_t size) { return calloc(count, size); }
+static inline void * ourrealloc(void *ptr, size_t size) { return realloc(ptr, size); }
 
 #endif/* _MY_MEMORY_H */