* @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__)
}
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+#define BAADFOOD_STR "\x0D\xF0\xAD\xBA"
+#endif
+# if __BYTE_ORDER == __BIG_ENDIAN
+#define BAADFOOD_STR "\xBA\xAD\xF0\x0D"
+#endif
+
+#if WINDOWS
+#define M_SIZE(p) _msize (p)
+#endif
+#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
+
/**
* Free memory. Merely a wrapper for the case that we
* want to keep track of allocations.
ptr = &((size_t *) ptr)[-1];
mem_used -= *((size_t *) ptr);
#endif
-#if WINDOWS
+#if defined(M_SIZE)
#if ENABLE_POISONING
{
size_t i;
- char baadfood[4] = "\xBA\xAD\xF0\x0D";
- size_t s = _msize (ptr);
+ char baadfood[5] = BAADFOOD_STR;
+ size_t s = M_SIZE (ptr);
for (i = 0; i < s; i++)
((char *) ptr)[i] = baadfood[i % 4];
}