From aae1fb67fdb983e874d9ce0a88a6baf3caeb2f1e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Jul 2008 02:02:18 +0000 Subject: Fix __USE_STDIO_FUTEXES__ fallout --- libpthread/nptl/sysdeps/unix/sysv/linux/fork.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/fork.c') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c index d8219c2ee..d2e2b3529 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include @@ -58,7 +58,6 @@ fresetlockfiles (void) #endif } -extern __typeof(fork) __libc_fork; pid_t __libc_fork (void) { pid_t pid; @@ -120,7 +119,11 @@ pid_t __libc_fork (void) break; } - __UCLIBC_IO_MUTEX_LOCK(_stdio_openlist_add_lock); +#ifdef __USE_STDIO_FUTEXES__ + _IO_lock_lock (_stdio_openlist_add_lock); +#else + __pthread_mutex_lock(&_stdio_openlist_add_lock); +#endif #ifndef NDEBUG pid_t ppid = THREAD_GETMEM (THREAD_SELF, tid); @@ -196,7 +199,11 @@ pid_t __libc_fork (void) THREAD_SETMEM (THREAD_SELF, pid, parentpid); /* We execute this even if the 'fork' call failed. */ - __UCLIBC_IO_MUTEX_UNLOCK(_stdio_openlist_add_lock); +#ifdef __USE_STDIO_FUTEXES__ + _IO_lock_unlock(_stdio_openlist_add_lock); +#else + __pthread_mutex_unlock(&_stdio_openlist_add_lock); +#endif /* Run the handlers registered for the parent. */ while (allp != NULL) -- cgit v1.2.3