PDCLib includes with quotes, not <>.

[pdclib] / opt / dlmalloc / dlmalloc.h

diff --git a/opt/dlmalloc/dlmalloc.h b/opt/dlmalloc/dlmalloc.h
index c62029840086fb6a5eca59b55fe26850269b91c9..b79a83e24bd1d517b32634dad097490524030ef2 100644 (file)
--- a/opt/dlmalloc/dlmalloc.h
+++ b/opt/dlmalloc/dlmalloc.h
@@ -1,6 +1,6 @@
-#include <_PDCLIB_aux.h>\r
-#include <_PDCLIB_config.h>\r
-#include <_PDCLIB_glue.h>\r
+#include "_PDCLIB_aux.h"\r
+#include "_PDCLIB_config.h"\r
+#include "_PDCLIB_glue.h"\r
 #include <threads.h>\r
 \r
 typedef mtx_t MLOCK_T;\r
@@ -18,12 +18,19 @@ static void init_malloc_global_mutex(void)
        mtx_init(&malloc_global_mutex, mtx_plain);\r
 }\r
 \r
-#define MMAP(s)   _PDCLIB_allocpages((s)/_PDCLIB_MALLOC_PAGESIZE)\r
+static inline void *MMAP( size_t nbytes )\r
+{\r
+    void *p = _PDCLIB_allocpages( nbytes / _PDCLIB_MALLOC_PAGESIZE );\r
+    return p ? p : (void*) (~(size_t)0);\r
+}\r
+\r
+#define MMAP(s) MMAP(s)\r
 #define DIRECT_MMAP(s) MMAP(s)\r
 #define MUNMAP(a, s) ((_PDCLIB_freepages((a), (s)/_PDCLIB_MALLOC_PAGESIZE)), 0)\r
 #define MREMAP(a, osz, nsz, mv) _PDCLIB_reallocpages((a), (osz)/_PDCLIB_MALLOC_PAGESIZE, (nsz)/_PDCLIB_MALLOC_PAGESIZE, (mv))\r
 \r
 #undef WIN32\r
+#undef _WIN32\r
 #define DLMALLOC_EXPORT  _PDCLIB_API\r
 #define MALLOC_ALIGNMENT _PDCLIB_MALLOC_ALIGN\r
 #define MSPACES 0\r
@@ -66,7 +73,7 @@ static void init_malloc_global_mutex(void)
 #define MAX_RELEASE_CHECK_RATE _PDCLIB_MALLOC_RELEASE_CHECK_RATE\r
 \r
 /* C standard says this is so */\r
-#define REALLOC_ZERO_BYTES_FREES 1 \r
+#define REALLOC_ZERO_BYTES_FREES 1\r
 #define LACKS_UNISTD_H\r
 #define LACKS_FCNTL_H\r
 #define LACKS_SYS_PARAM_H\r
@@ -75,4 +82,4 @@ static void init_malloc_global_mutex(void)
 #define LACKS_SYS_TYPES_H\r
 #define LACKS_SCHED_H\r
 #include <stdlib.h>\r
-#include <errno.h>
\ No newline at end of file
+#include <errno.h>\r