about summary refs log tree commit diff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2015-11-24 16:37:15 +0100
committerFlorian Weimer <fweimer@redhat.com>2015-11-24 16:37:15 +0100
commit400e12265d99964f8445bb6d717321eb73152cc5 (patch)
tree6473ade0eedb0503e4716ff79d50dc091a63e6ab /malloc/malloc.c
parenta61a1a2576e82c7a0c5de620b2eda755edeffb88 (diff)
downloadglibc-400e12265d99964f8445bb6d717321eb73152cc5.tar.gz
glibc-400e12265d99964f8445bb6d717321eb73152cc5.tar.xz
glibc-400e12265d99964f8445bb6d717321eb73152cc5.zip
Replace MUTEX_INITIALIZER with _LIBC_LOCK_INITIALIZER in generic code
	* sysdeps/mach/hurd/libc-lock.h (_LIBC_LOCK_INITIALIZER): Define.
	(__libc_lock_define_initialized): Use it.
	* sysdeps/nptl/libc-lockP.h (_LIBC_LOCK_INITIALIZER): Define.
	* malloc/arena.c (list_lock): Use _LIBC_LOCK_INITIALIZER.
	* malloc/malloc.c (main_arena): Likewise.
	* sysdeps/generic/malloc-machine.h (MUTEX_INITIALIZER): Remove.
	* sysdeps/nptl/malloc-machine.h (MUTEX_INITIALIZER): Remove.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 839263efc5..a030109c3e 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1760,7 +1760,7 @@ struct malloc_par
 
 static struct malloc_state main_arena =
 {
-  .mutex = MUTEX_INITIALIZER,
+  .mutex = _LIBC_LOCK_INITIALIZER,
   .next = &main_arena,
   .attached_threads = 1
 };