summary refs log tree commit diff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-29 22:53:29 +0000
committerRoland McGrath <roland@gnu.org>2002-09-29 22:53:29 +0000
commit57449fa348a10964474d4294d6005aa6800c4793 (patch)
treed9b855b573a961834ba1022ed66392a3f115a78a /malloc/malloc.c
parent79af0a1dca755275e8cc4597131b30c4601f1963 (diff)
downloadglibc-57449fa348a10964474d4294d6005aa6800c4793.tar.gz
glibc-57449fa348a10964474d4294d6005aa6800c4793.tar.xz
glibc-57449fa348a10964474d4294d6005aa6800c4793.zip
* malloc/malloc.c [! MALLOC_DEBUG] (assert): #undef before defining.
	* sysdeps/mach/hurd/Versions (ld: GLIBC_2.2.6): Add __errno_location.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index d480b0b8d0..757e65a37f 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -307,6 +307,7 @@ extern "C" {
 #if MALLOC_DEBUG
 #include <assert.h>
 #else
+#undef	assert
 #define assert(x) ((void)0)
 #endif