-code deduplication in rsa sign/verify code

[oweals/gnunet.git] / src / util / common_allocation.c

diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index a385450b944abd2e353fa253fa8e275c499c0f63..ab8715a6d27d4789093ee24e8d325a41c7900bcd 100644 (file)
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -23,9 +23,14 @@
  * @brief wrapper around malloc/free
  * @author Christian Grothoff
  */
-
 #include "platform.h"
 #include "gnunet_common.h"
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#if HAVE_MALLOC_MALLOC_H
+#include <malloc/malloc.h>
+#endif
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
 
@@ -190,14 +195,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
 #endif
 
 #if WINDOWS
-#define MSIZE(p) _msize (p)
+#define M_SIZE(p) _msize (p)
 #endif
-#if LINUX
-/* FIXME: manpage claims that this function is a GNU extension,
- * but googling shows that it is available on many platforms via
- * inclusion of various headers. For now let's make it Linux-only.
- */
-#define MSIZE(p) malloc_usable_size (p)
+#if HAVE_MALLOC_USABLE_SIZE
+#define M_SIZE(p) malloc_usable_size (p)
+#elif HAVE_MALLOC_SIZE
+#define M_SIZE(p) malloc_size (p)
 #endif
 
 /**
@@ -216,12 +219,12 @@ GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
   ptr = &((size_t *) ptr)[-1];
   mem_used -= *((size_t *) ptr);
 #endif
-#if defined(MSIZE)
+#if defined(M_SIZE)
 #if ENABLE_POISONING
   {
     size_t i;
     char baadfood[5] = BAADFOOD_STR;
-    size_t s = MSIZE (ptr);
+    size_t s = M_SIZE (ptr);
     for (i = 0; i < s; i++)
       ((char *) ptr)[i] = baadfood[i % 4];
   }