X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2Fmymemory.h;h=9708936e9d829934fd2176053ce37361a8edf6cb;hb=4e58b892d2ec0488b37551e29e37a94e1dca1602;hp=09ea7cdb535a85f88c5669c302423fbb8d399af3;hpb=4fb2e495226aac9979e026139f5b4a8eafa0eaba;p=satune.git

diff --git a/src/mymemory.h b/src/mymemory.h
index 09ea7cd..9708936 100644
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -25,21 +25,25 @@
    void * ourcalloc(size_t count, size_t size);
    void * ourrealloc(void *ptr, size_t size);
  */
-void * model_malloc(size_t size);
+
+#if 0
+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); }*/
+static inline void *ourrealloc(void *ptr, size_t size) { return realloc(ptr, size); }
+#endif
 
 #define CMEMALLOC                           \
 	void *operator new(size_t size) {       \