X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2Fmymemory.h;h=92fb0fed609057c3fd40132bcf507986489133cd;hp=8ad874b2c9e77d802114de59bd0b6716f1a54dd5;hb=f2bd73e95f61f25450c64a4ee737fa95263c7790;hpb=a10a09cec65239af24aa72aa2e05f08359d17a61

diff --git a/src/mymemory.h b/src/mymemory.h
index 8ad874b..92fb0fe 100644
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -24,24 +24,26 @@
    void ourfree(void *ptr);
    void * ourcalloc(size_t count, size_t size);
    void * ourrealloc(void *ptr, size_t size);
-*/
- /* 
-void * model_malloc(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);
+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 CMEMALLOC                           \
 	void *operator new(size_t size) {       \