mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

(__malloc_initialize): Remove pthread_once. Not needed.

Browse Source
This commit is contained in:
Jan Djärv 2007-07-29 10:12:32 +00:00
parent 40aa8257e0
commit 784c147269
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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

9
src/gmalloc.c
View File

@ -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;
}