Changeset 9cf75aa in git

Timestamp:

Oct 25, 2013, 7:52:59 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

2e473ad2aa438779b08e80f3d2175b85bac1f9f0

Parents:

32d8cb4d146c3b9e5d73001109ccb7837d4aae69

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-10-25 19:52:59+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-10-26 01:13:23+02:00

Message:

Fix omalloc/config (+ malloc_size / OSX)

Location:

omalloc

Files:

• configure.ac (modified) (4 diffs)
• omMallocSystem.h (modified) (1 diff)

omalloc/configure.ac

@@ -166 +166 @@
 BACKUP_CXXFLAGS=$CXXFLAGS
 BACKUP_LDFLAGS=$LDFLAGS
+
 CFLAGS="$CFLAGS -I$srcdir"
 CXXFLAGS="$CXXFLAGS -I$srcdir"
@@ -306 +307 @@
 {
   void* addr = OM_MALLOC_MALLOC(512);
+#ifdef OM_MALLOC_SIZEOF_ADDR 
   if (OM_MALLOC_SIZEOF_ADDR(addr) < 512)
     exit(1);
   exit(0);
+#else
+  exit(1);
+#endif
 }
 ], ac_cv_malloc_sizeof_addr="${OM_MALLOC_HEADER}_${OM_MALLOC_SOURCE}", ac_cv_malloc_sizeof_addr=no, ac_cv_malloc_sizeof_addr=no)
@@ -320 +325 @@
 AC_DEFINE(OM_MALLOC_PROVIDES_SIZEOF_ADDR,1,"Whether malloc provides SIZEOF_ADDR")
 fi
-
-dnl Restore user-specified CFLAGS, CXXFLAGS, LIBS
-
-CFLAGS=$BACKUP_CFLAGS
-CXXFLAGS=$BACKUP_CXXFLAGS
-LDFLAGS=$BACKUP_LDFLAGS
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -601 +600 @@
 
 
+dnl Restore user-specified CFLAGS, CXXFLAGS, LIBS
+
+CFLAGS=$BACKUP_CFLAGS
+CXXFLAGS=$BACKUP_CXXFLAGS
+LDFLAGS=$BACKUP_LDFLAGS
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll

omalloc/omMallocSystem.h

@@ -14 +14 @@
 #define OM_MALLOC_VALLOC   valloc
 #define OM_MALLOC_VFREE(addr, size) OM_MALLOC_FREE(addr)
+/* the following will work under Mac OS X */
+#define OM_MALLOC_SIZEOF_ADDR(addr)  (malloc_size(addr))
 
 #endif /* OM_MALLOC_SYSTEM_H */