From 33e3dbe62c420cc1cdee09d60735d20b5eff9a3d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 22 Aug 2015 20:41:31 +0200 Subject: quieten compile warnings Sync with glibc, quietens gcc warnings. --- libpthread/nptl/sysdeps/pthread/bits/libc-lock.h | 2 +- libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h b/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h index 4df507b84..633021ab1 100644 --- a/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h +++ b/libpthread/nptl/sysdeps/pthread/bits/libc-lock.h @@ -171,7 +171,7 @@ typedef pthread_key_t __libc_key_t; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ #if defined _LIBC && (!defined NOT_IN_libc || defined 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) diff --git a/libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h b/libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h index 5ad5d953e..ae39b87f4 100644 --- a/libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h +++ b/libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h @@ -31,7 +31,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t; #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) -- cgit v1.2.3