[Glibc-bsd-commits] r5965 - trunk/glibc-ports-2.23/fbtl/sysdeps/pthread

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-22 11:31:46 +0000 (Tue, 22 Mar 2016)
New Revision: 5965

Modified:
   trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h
Log:
fbtl/sysdeps/pthread/libc-lock.h: reduce differences with upstream


Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h	2016-03-22 11:25:31 UTC (rev 5964)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lock.h	2016-03-22 11:31:46 UTC (rev 5965)
@@ -16,8 +16,8 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If
    not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
+#ifndef _LIBC_LOCK_H
+#define _LIBC_LOCK_H 1
 
 #include <pthread.h>
 #define __need_NULL
@@ -48,7 +48,7 @@
 /* Define an initialized recursive lock variable NAME with storage
    class CLASS.  */
 #if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
-# 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;
 # define _LIBC_LOCK_RECURSIVE_INITIALIZER \
   { LLL_LOCK_INITIALIZER, 0, NULL }