Bug fix for printing ...
[satune.git] / src / mymemory.h
index e0a60bd13294b871199b826e88c0ea13261c1b3d..b78eb5427697f887d87c2d034e73227611a3cc6a 100644 (file)
    void ourfree(void *ptr);
    void * ourcalloc(size_t count, size_t size);
    void * ourrealloc(void *ptr, size_t size);
-*/
+ */
 
-#if 1
-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
@@ -45,21 +45,21 @@ static inline void *ourcalloc(size_t count, size_t size) { return calloc(count,
 static inline void *ourrealloc(void *ptr, size_t size) { return realloc(ptr, size); }
 #endif
 
-#define CMEMALLOC                           \
-       void *operator new(size_t size) {       \
-               return ourmalloc(size);                \
-       }                                                  \
-       void operator delete(void *p, size_t size) {       \
-               ourfree(p);                                      \
-       }                                                  \
-       void *operator new[](size_t size) {               \
-               return ourmalloc(size);                          \
-       }                                                    \
-       void operator delete[](void *p, size_t size) {       \
-               ourfree(p);                                        \
-       }                                                                     \
-       void *operator new(size_t size, void *p) {                                                                                                                      /* placement new */ \
-               return p;                                                           \
+#define CMEMALLOC                                                                                                              \
+       void *operator new(size_t size) {                               \
+               return ourmalloc(size);                                                          \
+       }                                                                                                                                                                                                        \
+       void operator delete(void *p, size_t size) {                     \
+               ourfree(p);                                                                                                                                                      \
+       }                                                                                                                                                                                                        \
+       void *operator new[](size_t size) {                                                             \
+               return ourmalloc(size);                                                                                                  \
+       }                                                                                                                                                                                                                \
+       void operator delete[](void *p, size_t size) {                   \
+               ourfree(p);                                                                                                                                                              \
+       }                                                                                                                                                                                                                                                                                       \
+       void *operator new(size_t size, void *p) {                                                                                                                      /* placement new */     \
+               return p;                                                                                                                                                                                                                                               \
        }
 
 #endif/* _MY_MEMORY_H */