aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-03-13 02:17:12 +0000
committerUlrich Drepper <drepper@redhat.com>2002-03-13 02:17:12 +0000
commit100351c3e1a858d32177f004e39a91d9d9a004ef (patch)
tree8766e6e71a3e8e70a282d2e71e2b2aee183faedd /malloc
parentaa32f79837bb38f8cea9daa26fd5eb6091861442 (diff)
downloadglibc-100351c3e1a858d32177f004e39a91d9d9a004ef.zip
glibc-100351c3e1a858d32177f004e39a91d9d9a004ef.tar.gz
glibc-100351c3e1a858d32177f004e39a91d9d9a004ef.tar.bz2
Update.
* stdio-common/itowa-digits.c (_itowa_lower_digits): Define as hidden. (_itowa_upper_digits): Likewise. * libio/stdio.c (_IO_stdin, _IO_stdout, _IO_stderr): Define as hidden. * libio/libio.h [_LIBC] (_IO_stdin, _IO_stdout, _IO_stderr): Declare as hidden. * libio/libioP.h: Declare _IO_file_jumps_mmap, _IO_wfile_jumps, _IO_wfile_jumps_mmap, _IO_proc_jumps, _IO_old_proc_jumps, _IO_str_jumps, _IO_wstr_jumps, _IO_file_jumps_internal, _IO_wfile_jumps_internal, and _IO_list_all_internal as hidden. * gmon/gmon.c (__bb_head): Define as hidden. * gmon/bb_exit_func.c (__bb_head): Declare as hidden. * argp/argp-parse.c (_argp_hang): Define as static. * include/libc-symbols.h (_INTVARDEF): Adjust for visibility handling in latest compilers. * inet/in6_addr.c (in6addr_any): Use INTVARDEF not INTDEF to define alias. * libio/fileops.c (_IO_file_jumps): Likewise. * libio/stdfiles.c (_IO_list_all): Likewise. * libio/wfileops.c (_IO_wfile_jumps): Likewise. * malloc/malloc.h: Move __libc_malloc_initialized declaration to include/malloc.h. * include/malloc.h: Add __libc_malloc_initialized declaration here. Mark variable hidden. * malloc/malloc.c: Include <malloc.h> not "malloc.h". * elf/dl-open.c (__libc_argc): Declare as hidden. (__libc_argv): Likewise. * sysdeps/generic/wordexp.c (__libc_argc): Declare as hidden. (__libc_argv): Likewise. * sysdeps/mach/hurd/i386/init-first.c: Define __libc_argc and __libc_argv as hidden. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/mach/hurd/powerpc/init-first.c: Likewise. * sysdeps/unix/sysv/aix/init-first.c: Likewise. * sysdeps/unix/sysv/linux/init-first.c: Likewise.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c2
-rw-r--r--malloc/malloc.h10
2 files changed, 2 insertions, 10 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index b1ab6e9..7414c70 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1401,7 +1401,7 @@ void public_mSTATs();
}; /* end of extern "C" */
#endif
-#include "malloc.h"
+#include <malloc.h>
#include "thread-m.h"
#ifndef BOUNDED_N
diff --git a/malloc/malloc.h b/malloc/malloc.h
index aaa95b3..5ddd780 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -1,5 +1,5 @@
/* Prototypes and definition for malloc implementation.
- Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2000, 2002 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
@@ -106,14 +106,6 @@
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;
-
/* Allocate SIZE bytes of memory. */
extern __malloc_ptr_t malloc __MALLOC_P ((size_t __size)) __attribute_malloc__;