aboutsummaryrefslogtreecommitdiff
path: root/nptl/sysdeps/pthread
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-05-01 13:08:30 -0700
committerRoland McGrath <roland@hack.frob.com>2014-05-01 13:08:30 -0700
commitc727f0325376e202d095be718daf64661409e499 (patch)
tree887be4f711bfce4dc4be6c0308ab2f0fee4e4981 /nptl/sysdeps/pthread
parenta849e800352ac5068dc6f1191c86ff62ba014c61 (diff)
downloadglibc-c727f0325376e202d095be718daf64661409e499.tar
glibc-c727f0325376e202d095be718daf64661409e499.tar.gz
glibc-c727f0325376e202d095be718daf64661409e499.tar.bz2
glibc-c727f0325376e202d095be718daf64661409e499.zip
Deconditionalize use of LLL_LOCK_INITIALIZER in bits/libc-lock.h.
Diffstat (limited to 'nptl/sysdeps/pthread')
-rw-r--r--nptl/sysdeps/pthread/bits/libc-lock.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/nptl/sysdeps/pthread/bits/libc-lock.h b/nptl/sysdeps/pthread/bits/libc-lock.h
index cddf11a382..532cf2c701 100644
--- a/nptl/sysdeps/pthread/bits/libc-lock.h
+++ b/nptl/sysdeps/pthread/bits/libc-lock.h
@@ -48,13 +48,8 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
/* Define an initialized recursive lock variable NAME with storage
class CLASS. */
#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-# if LLL_LOCK_INITIALIZER == 0
-# define __libc_lock_define_initialized_recursive(CLASS,NAME) \
- CLASS __libc_lock_recursive_t NAME;
-# else
-# define __libc_lock_define_initialized_recursive(CLASS,NAME) \
+# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
-# endif
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
{ LLL_LOCK_INITIALIZER, 0, NULL }
#else