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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-21 00:12:57 +0000 (Wed, 21 Oct 2015)
New Revision: 5809

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

commit ab49e7630f88ba9cc165dd2d855938c14ae4e158
Author: Roland McGrath <roland at hack.frob.com>
Date:   Mon Oct 20 14:13:14 2014 -0700

    Make internal lock-init macros return void.



Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h	2015-10-20 22:15:58 UTC (rev 5808)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lock.h	2015-10-21 00:12:57 UTC (rev 5809)
@@ -62,7 +62,7 @@
 /* Initialize a recursive mutex.  */
 #if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread))
 # define __libc_lock_init_recursive(NAME) \
-  ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
+  ((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER))
 #else
 # define __libc_lock_init_recursive(NAME) \
   do {									      \

Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h	2015-10-20 22:15:58 UTC (rev 5808)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/libc-lockP.h	2015-10-21 00:12:57 UTC (rev 5809)
@@ -126,16 +126,16 @@
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
    state.  */
 #if IS_IN (libc) || IS_IN (libpthread)
-# define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
+# define __libc_lock_init(NAME) \
+  ((void) ((NAME) = LLL_LOCK_INITIALIZER)) 
 #else
 # define __libc_lock_init(NAME) \
   __libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0)
 #endif
 #if defined SHARED && IS_IN (libc)
-/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER, 0) is
-   inefficient.  */
+/* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER) is inefficient.  */
 # define __libc_rwlock_init(NAME) \
-  (__builtin_memset (&(NAME), '\0', sizeof (NAME)), 0)
+  ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME))) 
 #else
 # define __libc_rwlock_init(NAME) \
   __libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0)

Modified: trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h	2015-10-20 22:15:58 UTC (rev 5808)
+++ trunk/glibc-ports/fbtl/sysdeps/pthread/bits/stdio-lock.h	2015-10-21 00:12:57 UTC (rev 5809)
@@ -31,7 +31,7 @@
 #define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
 
 #define _IO_lock_init(_name) \
-  ((_name) = (_IO_lock_t) _IO_lock_initializer , 0)
+  ((void) ((_name) = (_IO_lock_t) _IO_lock_initializer))
 
 #define _IO_lock_fini(_name) \
   ((void) 0)