[Glibc-bsd-commits] r5799 - trunk/glibc-ports/fbtl/sysdeps/pthread/bits

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 14:52:02 +0000 (Tue, 20 Oct 2015)
New Revision: 5799

Modified:
   trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
Log:
Merge from upstream:

commit c727f0325376e202d095be718daf64661409e499
Author: Roland McGrath <roland at hack.frob.com>
Date:   Thu May 1 13:08:30 2014 -0700

    Deconditionalize use of LLL_LOCK_INITIALIZER in bits/libc-lock.h.



Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h	2015-10-20 14:47:38 UTC (rev 5798)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h	2015-10-20 14:52:02 UTC (rev 5799)
@@ -48,13 +48,8 @@
 /* Define an initialized recursive lock variable NAME with storage
    class CLASS.  */
 #if defined _LIBC && (IS_IN (libc) || 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