DP code cleanup, stage one - all headers that can be protected by ifdef

[xonotic/darkplaces.git] / zone.h

diff --git a/zone.h b/zone.h
index d487969644fb413c8e179e26b15d6c407af6b541..d50265fbdc263feda5777f82e122d54db901e843 100644 (file)
--- a/zone.h
+++ b/zone.h
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef ZONE_H
+#define ZONE_H
+
 #define POOLNAMESIZE 128
 // give malloc padding so we can't waste most of a page at the end
 #define MEMCLUMPSIZE (65536 - 1536)
@@ -26,8 +29,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
 #define MEMBITINTS (MEMBITS / 32)
 
-#define MEMHEADER_SENTINEL 0xABADCAFE
-#define MEMCLUMP_SENTINEL 0xDEADF00D
+#define MEMHEADER_SENTINEL1 0xDEADF00D
+#define MEMHEADER_SENTINEL2 0xDF
+#define MEMCLUMP_SENTINEL 0xABADCAFE
 
 typedef struct memheader_s
 {
@@ -42,16 +46,16 @@ typedef struct memheader_s
        // file name and line where Mem_Alloc was called
        char *filename;
        int fileline;
-       // should always be MEMHEADER_SENTINEL
+       // should always be MEMHEADER_SENTINEL1
        int sentinel1;
-       // immediately followed by data, which is followed by another MEMHEADER_SENTINEL
+       // immediately followed by data, which is followed by a MEMHEADER_SENTINEL2 byte
 }
 memheader_t;
 
 typedef struct memclump_s
 {
        // contents of the clump
-       byte block[MEMCLUMPSIZE];
+       qbyte block[MEMCLUMPSIZE];
        // should always be MEMCLUMP_SENTINEL
        int sentinel1;
        // if a bit is on, it means that the MEMUNIT bytes it represents are
@@ -89,18 +93,20 @@ typedef struct mempool_s
 mempool_t;
 
 #define Mem_Alloc(pool,size) _Mem_Alloc(pool, size, __FILE__, __LINE__)
+#define Mem_Free(mem) _Mem_Free(mem, __FILE__, __LINE__)
 #define Mem_CheckSentinels(data) _Mem_CheckSentinels(data, __FILE__, __LINE__)
 #define Mem_CheckSentinelsGlobal() _Mem_CheckSentinelsGlobal(__FILE__, __LINE__)
+#define Mem_AllocPool(name) _Mem_AllocPool(name, __FILE__, __LINE__)
+#define Mem_FreePool(pool) _Mem_FreePool(pool, __FILE__, __LINE__)
+#define Mem_EmptyPool(pool) _Mem_EmptyPool(pool, __FILE__, __LINE__)
 
 void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline);
-void Mem_Free(void *data);
-mempool_t *Mem_AllocPool(char *name);
-void Mem_FreePool(mempool_t **pool);
-void Mem_EmptyPool(mempool_t *pool);
+void _Mem_Free(void *data, char *filename, int fileline);
+mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline);
+void _Mem_FreePool(mempool_t **pool, char *filename, int fileline);
+void _Mem_EmptyPool(mempool_t *pool, char *filename, int fileline);
 void _Mem_CheckSentinels(void *data, char *filename, int fileline);
 void _Mem_CheckSentinelsGlobal(char *filename, int fileline);
-void Mem_PrintStats(void);
-void Mem_PrintList(void);
 
 // used for temporary allocations
 mempool_t *tempmempool;
@@ -111,3 +117,6 @@ void Memory_Init_Commands (void);
 extern mempool_t *zonemempool;
 #define Z_Malloc(size) Mem_Alloc(zonemempool,size)
 #define Z_Free(data) Mem_Free(data)
+
+#endif
+