From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 29 Jul 2007 10:12:32 +0000 (+0000)
Subject: (__malloc_initialize): Remove pthread_once.  Not needed.
X-Git-Tag: emacs-pretest-23.0.90~11656
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=784c147269df476f3b1e13d458072e22f97aafa7;p=emacs.git

(__malloc_initialize): Remove pthread_once.  Not needed.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a8dd3891b73..43c9a9f6686 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gmalloc.c (__malloc_initialize): Remove pthread_once.  Not needed.
+
 2007-07-28  Nick Roberts  <nickrob@snap.net.nz>
 
 	* xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
diff --git a/src/gmalloc.c b/src/gmalloc.c
index fcd9f655321..cf79b9159f2 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -561,7 +561,6 @@ register_heapinfo ()
 }
 
 #ifdef USE_PTHREAD
-static pthread_once_t malloc_init_once_control = PTHREAD_ONCE_INIT;
 pthread_mutex_t _malloc_mutex = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t _aligned_blocks_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
@@ -607,18 +606,16 @@ malloc_initialize_1 ()
   return;
 }
 
-/* Set everything up and remember that we have.  */
+/* Set everything up and remember that we have.
+   main will call malloc which calls this function.  That is before any threads
+   or signal handlers has been set up, so we don't need thread protection.  */
 int
 __malloc_initialize ()
 {
-#ifdef USE_PTHREAD
-  pthread_once (&malloc_init_once_control, malloc_initialize_1);
-#else
   if (__malloc_initialized)
     return 0;
 
   malloc_initialize_1 ();
-#endif
 
   return __malloc_initialized;
 }