Edits

[satune.git] / src / mymemory.h

diff --git a/src/mymemory.h b/src/mymemory.h
index 294985d98a5deca8f07c884a5ae4e29015fb8e90..92fb0fed609057c3fd40132bcf507986489133cd 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -11,8 +11,8 @@
  *  @brief Memory allocation functions.
  */
 
-#ifndef _MY_MEMORY_H
-#define _MY_MEMORY_H
+#ifndef CSAT_MY_MEMORY_H
+#define CSAT_MY_MEMORY_H
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -26,12 +26,26 @@
    void * ourrealloc(void *ptr, size_t size);
  */
 
+#if 1
+void *model_malloc(size_t size);
+void model_free(void *ptr);
+void *model_calloc(size_t count, size_t size);
+void *model_realloc(void *ptr, size_t size);
+
+
+#define ourmalloc model_malloc
+#define ourfree model_free
+#define ourrealloc model_realloc
+#define ourcalloc model_calloc
+
+#else
 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
 
-#define MEMALLOC                           \
+#define CMEMALLOC                           \
        void *operator new(size_t size) {       \
                return ourmalloc(size);                \
        }                                                  \