X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=285facca38ea9a8f0920aa3b2e8e0bffb9dd3a22;hb=fe0d5dc2d85167fb8042bcb5157e93728e74e53a;hp=af6ddfd586ed67476ad6af1eb8b1f29937af4ee4;hpb=fa330326d7e8f8b15f73f77a7cce86a6e954f935;p=xonotic%2Fdarkplaces.git diff --git a/zone.h b/zone.h index af6ddfd5..285facca 100644 --- a/zone.h +++ b/zone.h @@ -66,7 +66,7 @@ memheader_t; typedef struct memclump_s { // contents of the clump - qbyte block[MEMCLUMPSIZE]; + unsigned char block[MEMCLUMPSIZE]; // should always be MEMCLUMP_SENTINEL unsigned int sentinel1; // if a bit is on, it means that the MEMUNIT bytes it represents are @@ -103,8 +103,6 @@ typedef struct mempool_s size_t realsize; // updated each time the pool is displayed by memlist, shows change from previous time (unless pool was freed) size_t lastchecksize; - // name of the pool - char name[POOLNAMESIZE]; // linked into global mempool list struct mempool_s *next; // parent object (used for nested memory pools) @@ -112,6 +110,8 @@ typedef struct mempool_s // file name and line where Mem_AllocPool was called const char *filename; int fileline; + // name of the pool + char name[POOLNAMESIZE]; // should always be MEMHEADER_SENTINEL1 unsigned int sentinel2; } @@ -136,7 +136,7 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline); qboolean Mem_IsAllocated(mempool_t *pool, void *data); // used for temporary allocations -mempool_t *tempmempool; +extern mempool_t *tempmempool; void Memory_Init (void); void Memory_Shutdown (void);