From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- libpthread/linuxthreads/lockfile.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'libpthread/linuxthreads/lockfile.c') diff --git a/libpthread/linuxthreads/lockfile.c b/libpthread/linuxthreads/lockfile.c index de834c476..1f6584a88 100644 --- a/libpthread/linuxthreads/lockfile.c +++ b/libpthread/linuxthreads/lockfile.c @@ -16,27 +16,36 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see . */ +#include #include #include - -extern __typeof(pthread_mutexattr_init) __pthread_mutexattr_init attribute_hidden; -extern __typeof(pthread_mutexattr_settype) __pthread_mutexattr_settype attribute_hidden; -extern __typeof(pthread_mutexattr_destroy) __pthread_mutexattr_destroy attribute_hidden; +#include "internals.h" /* Note: glibc puts flockfile, funlockfile, and ftrylockfile in both * libc and libpthread. In uClibc, they are now in libc only. */ -void __fresetlockfiles (void); -void __fresetlockfiles (void) +void +__flockfilelist(void) +{ +} + +void +__funlockfilelist(void) +{ +} + +void +__fresetlockfiles (void) { FILE *fp; + pthread_mutexattr_t attr; - __pthread_mutexattr_init(&attr); - __pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + __pthread_mutexattr_init (&attr); + __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP); for (fp = _stdio_openlist; fp != NULL; fp = fp->__nextopen) - __pthread_mutex_init(&fp->__lock, &attr); + pthread_mutex_init (&fp->__lock, &attr); - __pthread_mutexattr_destroy(&attr); + pthread_mutexattr_destroy(&attr); } -- cgit v1.2.3