diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-01-28 03:59:29 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-28 03:59:29 +0000 |
commit | 831372e7c1bb907f9f2c3d78909b15717b8ac095 (patch) | |
tree | caaa80503af0be017a6a88df30dcf295cdc2e63c /malloc/malloc.h | |
parent | bdf289b22254f7eb10989ccd933cfd9ee7b8da92 (diff) | |
download | glibc-831372e7c1bb907f9f2c3d78909b15717b8ac095.zip glibc-831372e7c1bb907f9f2c3d78909b15717b8ac095.tar.gz glibc-831372e7c1bb907f9f2c3d78909b15717b8ac095.tar.bz2 |
update from main archive 970127cvs/libc-970128
1997-01-28 04:23 Ulrich Drepper <drepper@cygnus.com>
* version.h (VERSION): Bump to 2.0.1.
* posix/getopt.c: Handle another problem introduced by the
nonoption_flags array. We must be able to work with reordered
argv arrays. Reported by Andreas Schwab.
1997-01-28 02:38 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Correct handling of new
1997-01-27 17:34 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nis/rpcsvc/yp_prot.h: Correct definitions and types in file so
that it works with yp.h.
1997-01-27 13:28 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.h (__malloc_initialized) [_LIBC]: Define as
__libc_malloc_initialized so that this variable is not shared with
other users of GNU malloc.
Suggested by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>.
* mcheck.h: Correct typo. Use malloc/ instead of new-malloc/.
* sysdeps/i386/Makefile (CFLAGS-dl-load.c, CFLAGS-dl-reloc.c): New
variables to prevent warnings.
* sysdeps/i386/dl-machine.h (fixup): Add prototype and declare
using attribute regparm.
(ELF_MACHINE_RUNTIME_TRAMPOLINE): Rewrite so that no register
is changed by the resolver code.
1997-01-14 14:20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* malloc/malloc.c (weak_variable): Define.
(__malloc_initialize_hook, __free_hook, __malloc_hook, __realloc_hook,
__memalign_hook): Make them weak definitions.
1997-01-26 11:35 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/getdents.c: Don't write beyond buffer
limits, correctly take structure padding into account, use correct
offset when resetting the stream, change heuristic to assume an
average name length of 14 characters.
1997-01-25 18:06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/alpha/termbits.h: Protect against multiple
inclusion.
See ChangeLog.6 for earlier changes.
Diffstat (limited to 'malloc/malloc.h')
-rw-r--r-- | malloc/malloc.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/malloc/malloc.h b/malloc/malloc.h index ddbc694..5794f26 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -1,5 +1,5 @@ /* Prototypes and definition for malloc implementation. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -74,6 +74,11 @@ extern "C" { #endif /* Nonzero if the malloc is already initialized. */ +#ifdef _LIBC +/* In the GNU libc we rename the global variable + `__malloc_initialized' to `__libc_malloc_initialized'. */ +#define __malloc_initialized __libc_malloc_initialized +#endif extern int __malloc_initialized; /* Initialize global configuration. Not needed with GNU libc. */ @@ -178,7 +183,7 @@ extern __malloc_ptr_t (*__memalign_hook) __MALLOC_P ((size_t __size, size_t __alignment)); /* Activate a standard set of debugging hooks. */ -extern void malloc_check_init __MALLOC_P ((void)); +extern void __malloc_check_init __MALLOC_P ((void)); #endif |