common: Define DP_STATIC_ASSERT which wraps static_assert

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index 8657a476ae37647262fa5bd27be042214207908e..23258a278c0bcc74b90323f353856bcd265ed662 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -146,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;
@@ -157,6 +160,7 @@ static void *attempt_malloc(size_t size)
                Sys_Sleep(1000);
        }
        return NULL;
+#endif
 }
 #endif
 
@@ -201,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;
@@ -312,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;
@@ -867,14 +871,14 @@ static void MemStats_f(cmd_state_t *cmd)
 }
 
 
-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;
 }