diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/malloc.c | 7 | ||||
| -rw-r--r-- | stdio-common/bug1.c | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index cd99f577d8..61e519a599 100644 --- 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 31ab045a06..a2b80a9997 100644 --- 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 468be5ca22..18e7d4c257 100644 --- a/stdio-common/bug1.c +++ b/stdio-common/bug1.c @@ -1,4 +1,5 @@ #include <stdio.h> +#include <stdlib.h> #include <string.h> int |