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. --- sysdeps/generic/malloc-machine.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sysdeps/generic/malloc-machine.h') diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h index 802d1f5b43..7b7eae807b 100644 --- a/sysdeps/generic/malloc-machine.h +++ b/sysdeps/generic/malloc-machine.h @@ -38,7 +38,6 @@ typedef int mutex_t; # define mutex_lock(m) ({ *(m) = 1; 0; }) # define mutex_trylock(m) (*(m) ? 1 : ((*(m) = 1), 0)) # define mutex_unlock(m) (*(m) = 0) -# define MUTEX_INITIALIZER (0) #endif /* !defined mutex_init */ -- cgit 1.4.1