diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 03:45:53 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-06 03:45:53 +0000 |
| commit | 821e7539de6922c96e2a4fc5baa11fdc335072c9 (patch) | |
| tree | 8ee7f5ac1797850d304a3b10ff4a7ca4d4f2a2dc /libc/stdio/popen.c | |
| parent | bd7bace793536f027790396d6358c14299e8595b (diff) | |
| download | uClibc-alpine-821e7539de6922c96e2a4fc5baa11fdc335072c9.tar.bz2 uClibc-alpine-821e7539de6922c96e2a4fc5baa11fdc335072c9.tar.xz | |
More merging from trunk.
Diffstat (limited to 'libc/stdio/popen.c')
| -rw-r--r-- | libc/stdio/popen.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c index 6de09253c..2e9985a39 100644 --- a/libc/stdio/popen.c +++ b/libc/stdio/popen.c @@ -14,6 +14,8 @@ * Fix failure exit code for failed execve(). */ +#define waitpid __waitpid +#define execl __execl #include <stdio.h> #include <stdlib.h> @@ -30,14 +32,11 @@ #endif #ifdef __UCLIBC_HAS_THREADS__ -#include <pthread.h> +# include <pthread.h> static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK __pthread_mutex_lock(&mylock) -# define UNLOCK __pthread_mutex_unlock(&mylock); -#else -# define LOCK ((void) 0) -# define UNLOCK ((void) 0) -#endif +#endif +#define LOCK __pthread_mutex_lock(&mylock) +#define UNLOCK __pthread_mutex_unlock(&mylock) #ifndef VFORK_LOCK # define VFORK_LOCK LOCK |