about summary refs log tree commit diff
path: root/sysdeps/mach
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 /sysdeps/mach
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 'sysdeps/mach')
-rw-r--r--sysdeps/mach/hurd/libc-lock.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/libc-lock.h b/sysdeps/mach/hurd/libc-lock.h
index b67a049bca..4f3bb5cbf5 100644
--- a/sysdeps/mach/hurd/libc-lock.h
+++ b/sysdeps/mach/hurd/libc-lock.h
@@ -50,8 +50,9 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
   CLASS __libc_lock_t NAME;
 
 /* Define an initialized lock variable NAME with storage class CLASS.  */
+#define _LIBC_LOCK_INITIALIZER MUTEX_INITIALIZER
 #define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME = MUTEX_INITIALIZER;
+  CLASS __libc_lock_t NAME = _LIBC_LOCK_INITIALIZER;
 
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
    state.  */