common: Define DP_STATIC_ASSERT which wraps static_assert

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index bba4ea3627f5e77d6d5889121e1ca10e4b423edb..23258a278c0bcc74b90323f353856bcd265ed662 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "darkplaces.h"
 
-void R_TextureStats_Print(qbool, qbool, qbool);
-void GL_Mesh_ListVBOs(qbool);
-
 #ifdef WIN32
 #include <windows.h>
 #include <winbase.h>
@@ -149,6 +146,9 @@ static void mmap_free(void *mem)
 // (Windows growing its swapfile for example)
 static void *attempt_malloc(size_t size)
 {
+#ifndef WIN32
+       return malloc(size);
+#else
        void *base;
        // try for half a second or so
        unsigned int attempts = 500;
@@ -160,6 +160,7 @@ static void *attempt_malloc(size_t size)
                Sys_Sleep(1000);
        }
        return NULL;
+#endif
 }
 #endif
 
@@ -204,14 +205,14 @@ static void *Clump_AllocBlock(size_t size)
 #if MEMCLUMPING
        if (size <= MEMCLUMPSIZE)
        {
-               int index;
-               unsigned int bit;
-               unsigned int needbits;
-               unsigned int startbit;
-               unsigned int endbit;
-               unsigned int needints;
-               int startindex;
-               int endindex;
+               intptr_t index;
+               size_t bit;
+               size_t needbits;
+               size_t startbit;
+               size_t endbit;
+               size_t needints;
+               intptr_t startindex;
+               intptr_t endindex;
                unsigned int value;
                unsigned int mask;
                unsigned int *array;
@@ -315,10 +316,10 @@ nofreeblock:
 static void Clump_FreeBlock(void *base, size_t size)
 {
 #if MEMCLUMPING
-       unsigned int needbits;
-       unsigned int startbit;
-       unsigned int endbit;
-       unsigned int bit;
+       size_t needbits;
+       size_t startbit;
+       size_t endbit;
+       size_t bit;
        memclump_t **clumpchainpointer;
        memclump_t *clump;
        unsigned char *start = (unsigned char *)base;
@@ -866,20 +867,18 @@ static void MemList_f(cmd_state_t *cmd)
 static void MemStats_f(cmd_state_t *cmd)
 {
        Mem_CheckSentinelsGlobal();
-       R_TextureStats_Print(false, false, true);
-       GL_Mesh_ListVBOs(false);
        Mem_PrintStats();
 }
 
 
-char* Mem_strdup (mempool_t *pool, const char* s)
+char* _Mem_strdup (mempool_t *pool, const char* s, const char *filename, int fileline)
 {
        char* p;
        size_t sz;
        if (s == NULL)
                return NULL;
        sz = strlen (s) + 1;
-       p = (char*)Mem_Alloc (pool, sz);
+       p = (char*)_Mem_Alloc (pool, NULL, sz, 16, filename, fileline);
        strlcpy (p, s, sz);
        return p;
 }