|
@@ -1,27 +1,17 @@
|
|
|
#ifndef _SH_MALLOC_H
|
|
|
#define _SH_MALLOC_H
|
|
|
|
|
|
-#ifdef MEM_DBG
|
|
|
-
|
|
|
-#include <stdlib.h>
|
|
|
-
|
|
|
-#define sh_malloc(size) ({ void *_p=malloc((size)); \
|
|
|
- printf("MEMDBG: malloc (%d): %p\n", (size), _p); \
|
|
|
- _p; })
|
|
|
-
|
|
|
-#define sh_free(ptr) ({ printf("MEMDBG: free: %p\n", (ptr)); free((ptr)); })
|
|
|
|
|
|
/*
|
|
|
-#elif defined SHM_MEM
|
|
|
+#if defined SHM_MEM
|
|
|
|
|
|
#include "../../shm_mem.h"
|
|
|
|
|
|
#define sh_malloc(size) shm_malloc((size))
|
|
|
#define sh_free(ptr) shm_free((ptr))
|
|
|
|
|
|
-*/
|
|
|
-
|
|
|
#else
|
|
|
+*/
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
@@ -30,5 +20,17 @@
|
|
|
|
|
|
#endif
|
|
|
|
|
|
+/*
|
|
|
+#ifdef MEM_DBG
|
|
|
+
|
|
|
+#include <stdlib.h>
|
|
|
+
|
|
|
+#define sh_malloc(size) ({ void *_p=malloc((size)); \
|
|
|
+ printf("MEMDBG: malloc (%d): %p\n", (size), _p); \
|
|
|
+ _p; })
|
|
|
+
|
|
|
+#define sh_free(ptr) ({ printf("MEMDBG: free: %p\n", (ptr)); free((ptr)); })
|
|
|
+
|
|
|
|
|
|
#endif
|
|
|
+*/
|