diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-12-06 01:29:10 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-06 01:29:10 +0000 |
| commit | aab07d0500d06e1de93280cb9900b24fd0c0875b (patch) | |
| tree | 7122ec94b0498c150b69401a13f06aaea803cf50 /libc/pwd_grp | |
| parent | 680f8428162687caae571090e008b42d18f2bb5a (diff) | |
macro out the thread funcs in libc if threading is disabled
Diffstat (limited to 'libc/pwd_grp')
| -rw-r--r-- | libc/pwd_grp/lckpwdf.c | 11 | ||||
| -rw-r--r-- | libc/pwd_grp/pwd_grp.c | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c index 9c0b75297..2b3fa7596 100644 --- a/libc/pwd_grp/lckpwdf.c +++ b/libc/pwd_grp/lckpwdf.c @@ -31,14 +31,11 @@ #include <paths.h> #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 -# define UNLOCK -#endif +#endif +#define LOCK __pthread_mutex_lock(&mylock) +#define UNLOCK __pthread_mutex_unlock(&mylock) /* How long to wait for getting the lock before returning with an error. */ diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c index 3baa0ad33..601568599 100644 --- a/libc/pwd_grp/pwd_grp.c +++ b/libc/pwd_grp/pwd_grp.c @@ -402,15 +402,12 @@ int getpw(uid_t uid, char *buf) #endif /**********************************************************************/ #if defined(L_getpwent_r) || defined(L_getgrent_r) || defined(L_getspent_r) - #ifdef __UCLIBC_HAS_THREADS__ +# 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 +#define LOCK __pthread_mutex_lock(&mylock) +#define UNLOCK __pthread_mutex_unlock(&mylock) #endif #ifdef L_getpwent_r |