--- a/src/gmalloc.c	Mon Aug 13 09:09:05 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 09:09: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));
@@ -431,7 +431,7 @@
 __malloc_size_t _bytes_free;
 
 /* Are you experienced?  */
-int __malloc_initialized;
+static int __malloc_initialized;
 
 void (*__after_morecore_hook) __P ((void));
 
@@ -556,13 +556,13 @@
     return NULL;
 #endif
 
+  if (__malloc_hook != NULL)
+    return (*__malloc_hook) (size);
+
   if (!__malloc_initialized)
     if (!initialize ())
       return NULL;
 
-  if (__malloc_hook != NULL)
-    return (*__malloc_hook) (size);
-
 #ifdef SUNOS_LOCALTIME_BUG
   /* Workaround for localtime() allocating 8 bytes and writing 9 bug... */
   if (size < 16)