Redeclaration of standard functions by dlmalloc. Fixed. Re-enabled warnings in Jamrules.

[pdclib] / opt / dlmalloc / dlmalloc.c

diff --git a/opt/dlmalloc/dlmalloc.c b/opt/dlmalloc/dlmalloc.c
index 32c3c35686d582443a7a2f3033936c7e87506207..865b5b95afa46c04084dc241ceff38589d160b17 100644 (file)
--- a/opt/dlmalloc/dlmalloc.c
+++ b/opt/dlmalloc/dlmalloc.c
@@ -516,6 +516,7 @@ MAX_RELEASE_CHECK_RATE   default: 4095 unless not HAVE_MMAP
   improvement at the expense of carrying around more memory.\r
 */\r
 \r
+#ifndef REGTEST\r
 #include "dlmalloc.h"\r
 \r
 /* Version identifier to allow people to support multiple versions */\r
@@ -834,6 +835,8 @@ extern "C" {
 #define dlbulk_free            bulk_free\r
 #endif /* USE_DL_PREFIX */\r
 \r
+#if 0 // Redeclaration warnings as PDCLib already declares these in <stdio.h>\r
+\r
 /*\r
   malloc(size_t n)\r
   Returns a pointer to a newly allocated chunk of at least n bytes, or\r
@@ -890,6 +893,8 @@ DLMALLOC_EXPORT void* dlcalloc(size_t, size_t);
 */\r
 DLMALLOC_EXPORT void* dlrealloc(void*, size_t);\r
 \r
+#endif\r
+\r
 /*\r
   realloc_in_place(void* p, size_t n)\r
   Resizes the space allocated for p to size n, only if this can be\r
@@ -1643,7 +1648,6 @@ unsigned char _BitScanReverse(unsigned long *index, unsigned long mask);
    is unlikely to be needed, but is supplied just in case.\r
 */\r
 #define MMAP_FLAGS           (MAP_PRIVATE)\r
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */\r
 #define MMAP_DEFAULT(s) ((dev_zero_fd < 0) ? \\r
            (dev_zero_fd = open("/dev/zero", O_RDWR), \\r
             mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \\r
@@ -3836,7 +3840,7 @@ static void* mmap_alloc(mstate m, size_t nb) {
 /* Realloc using mmap */\r
 static mchunkptr mmap_resize(mstate m, mchunkptr oldp, size_t nb, int flags) {\r
   size_t oldsize = chunksize(oldp);\r
-  flags = flags; /* placate people compiling -Wunused */\r
+  (void) flags;\r
   if (is_small(nb)) /* Can't shrink mmap regions below small size */\r
     return 0;\r
   /* Keep old chunk if big enough but not too big */\r
@@ -6251,3 +6255,15 @@ History:
          structure of old version,  but most details differ.)\r
 \r
 */\r
+#endif\r
+\r
+#ifdef TEST\r
+#include <_PDCLIB_test.h>\r
+\r
+/* TODO: TEST ME */\r
+int main( void )\r
+{\r
+    return TEST_RESULTS;\r
+}\r
+\r
+#endif\r