From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 16 Jul 2009 10:17:52 +0000 (+0000)
Subject: fix replacement malloc
X-Git-Tag: release-1.3.3rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b9e9b41117d4f42e12770b5a27bcda0a830671e;p=thirdparty%2Funbound.git

fix replacement malloc

git-svn-id: file:///svn/unbound/trunk@1728 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/compat/malloc.c b/compat/malloc.c
index e13ac2b64..559aa100d 100644
--- a/compat/malloc.c
+++ b/compat/malloc.c
@@ -2,6 +2,7 @@
    GNU-compliant. See autoconf documentation. */
 
 #include "config.h"
+#undef malloc
 #include <sys/types.h>
 
 void *malloc ();
@@ -10,7 +11,7 @@ void *malloc ();
    If N is zero, allocate a 1-byte block.  */
 
 void *
-malloc (size_t n)
+rpl_malloc_unbound (size_t n)
 {
   if (n == 0)
     n = 1;
diff --git a/doc/Changelog b/doc/Changelog
index ffe305b36..ae429daa8 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+16 July 2009: Wouter
+	- fix replacement malloc code.  Used in crosscompile.
+
 15 July 2009: Wouter
 	- dependencies for compat items, for crosscompile.
 	- mingw32 crosscompile changes, dependencies and zipfile creation.