diff src/gmalloc.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 441bb1e64a06
children 1ce6082ce73f
line wrap: on
line diff
--- a/src/gmalloc.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 09:02:59 2007 +0200
@@ -258,7 +258,7 @@
 extern void (*__after_morecore_hook) __P ((void));
 
 /* Nonzero if `malloc' has been called and done its initialization.  */
-    /* extern int __malloc_initialized; */
+extern int __malloc_initialized;
 
 /* Hooks for debugging versions.  */
 extern void (*__free_hook) __P ((__ptr_t __ptr));
@@ -351,9 +351,7 @@
 #if defined (__GNU_LIBRARY__) || defined (_LIBC)
 #include <stddef.h>
 #include <sys/cdefs.h>
-#if ! (defined (__GLIBC__) && (__GLIBC__ >= 2))
 extern size_t __getpagesize __P ((void));
-#endif
 #else
 #include "getpagesize.h"
 #define	 __getpagesize()	getpagesize()
@@ -433,7 +431,7 @@
 __malloc_size_t _bytes_free;
 
 /* Are you experienced?  */
-static int __malloc_initialized;
+int __malloc_initialized;
 
 void (*__after_morecore_hook) __P ((void));
 
@@ -1299,11 +1297,9 @@
 #ifdef __GNU_LIBRARY__
 /* It is best not to declare this and cast its result on foreign operating
    systems with potentially hostile include files.  */
-#if !(defined(linux) && defined(sparc))
 extern __ptr_t __sbrk __P ((int increment));
 #endif
 #endif
-#endif
 
 #ifndef NULL
 #define NULL 0