From 400e12265d99964f8445bb6d717321eb73152cc5 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 24 Nov 2015 16:37:15 +0100 Subject: 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. --- malloc/arena.c | 2 +- malloc/malloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'malloc') diff --git a/malloc/arena.c b/malloc/arena.c index 0f00afa..3dab7bb 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -73,7 +73,7 @@ static __thread mstate thread_arena attribute_tls_model_ie; objects. No other (malloc) locks must be taken while list_lock is active, otherwise deadlocks may occur. */ -static mutex_t list_lock = MUTEX_INITIALIZER; +static mutex_t list_lock = _LIBC_LOCK_INITIALIZER; static size_t narenas = 1; static mstate free_list; diff --git a/malloc/malloc.c b/malloc/malloc.c index 839263e..a030109 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 }; -- cgit v1.1