Update.

	* stdio-common/bug1.c: Include <stdlib.h> to get prototype for free.

	* malloc/malloc.c: Add missing chunk of patch from 1999-07-04.

diff --git a/ChangeLog b/ChangeLog
index cd99f57..61e519a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-07-17  Ulrich Drepper  <drepper@cygnus.com>
 
+       * stdio-common/bug1.c: Include <stdlib.h> to get prototype for free.
+
+       * malloc/malloc.c: Add missing chunk of patch from 1999-07-04.
+
        * sysdeps/unix/sysv/linux/bits/time.h (timeval): Use __suseconds_t
        type for tv_usec element.
        * sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 31ab045..a2b80a9 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4436,13 +4436,10 @@ realloc_check(oldmem, bytes, caller)
   oldp = mem2chunk_check(oldmem);
   if(!oldp) {
     (void)mutex_unlock(&main_arena.mutex);
-    switch(check_action) {
-    case 1:
+    if (check_action & 1)
       fprintf(stderr, "realloc(): invalid pointer %p!\n", oldmem);
-      break;
-    case 2:
+    if (check_action & 2)
       abort();
-    }
     return malloc_check(bytes, NULL);
   }
   oldsize = chunksize(oldp);

diff --git a/stdio-common/bug1.c b/stdio-common/bug1.c
index 468be5c..18e7d4c 100644 (file)
--- a/stdio-common/bug1.c
+++ b/stdio-common/bug1.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 int