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

[aurel32 at alioth.debian.org]

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

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


Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h	2016-03-22 10:35:19 UTC (rev 5963)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/libc-lockP.h	2016-03-22 11:25:31 UTC (rev 5964)
@@ -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_LOCKP_H
-#define _BITS_LIBC_LOCKP_H 1
+#ifndef _LIBC_LOCKP_H
+#define _LIBC_LOCKP_H 1
 
 #include <pthread.h>
 #define __need_NULL
@@ -140,7 +140,7 @@
    state.  */
 #if IS_IN (libc) || IS_IN (libpthread)
 # define __libc_lock_init(NAME) \
-  ((void) ((NAME) = LLL_LOCK_INITIALIZER)) 
+  ((void) ((NAME) = LLL_LOCK_INITIALIZER))
 #else
 # define __libc_lock_init(NAME) \
   __libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
@@ -148,7 +148,7 @@
 #if defined SHARED && IS_IN (libc)
 /* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER) is inefficient.  */
 # define __libc_rwlock_init(NAME) \
-  ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME))) 
+  ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME)))
 #else
 # define __libc_rwlock_init(NAME) \
   __libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0)