diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-21 00:05:53 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-09-21 00:05:53 +0200 |
| commit | 1f32bdc2e2f54cf4279b720909ff9c2d64a1c406 (patch) | |
| tree | 03761c564ebe347a2924667ac4b4d4fabbb58dfe /sysdeps/pthread | |
| parent | a9d69ae8ab389dc9f47aef519dac4f422b4120ef (diff) | |
| parent | 1d49ccdd73c182ad9f280d21d5a5e88bd59db871 (diff) | |
Merge branch 'master' into master-glibc-2.23
Diffstat (limited to 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/bits/once.h | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/flockfile.c | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/ftrylockfile.c | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/funlockfile.c | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sysdeps/pthread/bits/once.h b/sysdeps/pthread/bits/once.h index 05895b9..53dbfd3 100644 --- a/sysdeps/pthread/bits/once.h +++ b/sysdeps/pthread/bits/once.h @@ -29,6 +29,6 @@ struct __pthread_once }; #define __PTHREAD_ONCE_INIT \ - { 0, __PTHREAD_SPIN_LOCK_INITIALIZER } + (struct __pthread_once) { 0, __PTHREAD_SPIN_LOCK_INITIALIZER } #endif /* bits/once.h */ diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c index b552cd6..0153a2c 100644 --- a/sysdeps/pthread/flockfile.c +++ b/sysdeps/pthread/flockfile.c @@ -22,8 +22,7 @@ void -__flockfile (stream) - FILE *stream; +__flockfile (FILE *stream) { #ifdef SHARED __libc_ptf_call (_IO_flockfile, (stream), 0); diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c index c33de88..48420de 100644 --- a/sysdeps/pthread/ftrylockfile.c +++ b/sysdeps/pthread/ftrylockfile.c @@ -23,8 +23,7 @@ int -__ftrylockfile (stream) - FILE *stream; +__ftrylockfile (FILE *stream) { #ifdef SHARED return __libc_ptf_call (_IO_ftrylockfile, (stream), 0); diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c index 05edc66..78fd211 100644 --- a/sysdeps/pthread/funlockfile.c +++ b/sysdeps/pthread/funlockfile.c @@ -23,8 +23,7 @@ void -__funlockfile (stream) - FILE *stream; +__funlockfile (FILE *stream) { #ifdef SHARED __libc_ptf_call (_IO_funlockfile, (stream), 0); |