Changeset 79e9d1 in git for omalloc

Timestamp:

Sep 16, 2019, 12:09:51 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c8a22acb36f3d2e85dbb125cc9077be569847c9b

Parents:

a853df285d8d22e2cba18f1e83c01fb064e0ceed

Message:

fix: xalloc for OsX: malloc.h vs. malloc/malloc.h

Location:

omalloc

Files:

• configure.ac (modified) (1 diff)
• omAllocSystem.c (modified) (1 diff)
• omMallocSystem.h (modified) (1 diff)
• xalloc.h (modified) (1 diff)

omalloc/configure.ac

@@ -156 +156 @@
   AC_MSG_ERROR(Can not compile without limits.h))
 
-AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h /usr/include/malloc.h)
+AC_CHECK_HEADERS(unistd.h sys/mman.h fcntl.h malloc.h malloc/malloc.h)
 
 AC_CHECK_FUNCS(popen mmap sbrk random malloc_usable_size malloc_size)

omalloc/omAllocSystem.c

@@ -32 +32 @@
 /* allocation of large addr */
 #if defined(HAVE_MALLOC_SIZE)
-#include <malloc/malloc.h>
-#define _omSizeOfLargeAddr(addr) (malloc_size(addr))
+  #ifdef HAVE_MALLOC_H
+  #include <malloc.h>
+  #elif defined(HAVE_MALLOC_MALLOC_H)
+  #include <malloc/malloc.h>
+  #endif
+  #define _omSizeOfLargeAddr(addr) (malloc_size(addr))
 #elif defined(HAVE_MALLOC_USABLE_SIZE)
-#include <stdlib.h>
-#define _omSizeOfLargeAddr(addr) (malloc_usable_size(addr))
+  #include <stdlib.h>
+  #define _omSizeOfLargeAddr(addr) (malloc_usable_size(addr))
 #else
 void* omAllocLarge(size_t size)

omalloc/omMallocSystem.h

@@ -16 +16 @@
 #ifdef HAVE_MALLOC_SIZE
 /* the following will work under Mac OS X */
-#include <malloc/malloc.h>
-#define OM_MALLOC_SIZEOF_ADDR(addr)  (malloc_size(addr))
+  #ifdef HAVE_MALLOC_H
+  #include <malloc.h>
+  #elif defined(HAVE_MALLOC_MALLOC_H)
+  #include <malloc/malloc.h>
+  #endif
+  #define OM_MALLOC_SIZEOF_ADDR(addr)  (malloc_size(addr))
 #elif (defined(HAVE_MALLOC_USABLE_SIZE))
 /* and this will work under Linux */

omalloc/xalloc.h

@@ -14 +14 @@
 #include "omalloc/omConfig.h"
 #if defined(HAVE_MALLOC_USABLE_SIZE) || defined(HAVE_MALLOC_SIZE)
-#include <malloc.h>
+  #ifdef HAVE_MALLOC_H
+  #include <malloc.h>
+  #elif defined(HAVE_MALLOC_MALLOC_H)
+  #include <malloc/malloc.h>
+  #endif
 #endif
 #ifdef __cplusplus