aboutsummaryrefslogtreecommitdiff
path: root/malloc
diff options
context:
space:
mode:
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 b1ab6e9f7e..7414c705a9 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 aaa95b3a2c..5ddd780958 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__;