From aab07d0500d06e1de93280cb9900b24fd0c0875b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 6 Dec 2005 01:29:10 +0000 Subject: macro out the thread funcs in libc if threading is disabled --- libc/inet/rpc/create_xid.c | 9 +++------ libc/inet/rpc/getrpcent.c | 7 ++----- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'libc/inet/rpc') diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c index 3ef1850dd..3dbf7af61 100644 --- a/libc/inet/rpc/create_xid.c +++ b/libc/inet/rpc/create_xid.c @@ -31,14 +31,11 @@ /* The RPC code is not threadsafe, but new code should be threadsafe. */ #ifdef __UCLIBC_HAS_THREADS__ -#include +# include static pthread_mutex_t createxid_lock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK __pthread_mutex_lock(&createxid_lock) -# define UNLOCK __pthread_mutex_unlock(&createxid_lock); -#else -# define LOCK -# define UNLOCK #endif +#define LOCK __pthread_mutex_lock(&createxid_lock) +#define UNLOCK __pthread_mutex_unlock(&createxid_lock) static int is_initialized; static struct drand48_data __rpc_lrand48_data; diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c index c261dfb3b..47a0b0c13 100644 --- a/libc/inet/rpc/getrpcent.c +++ b/libc/inet/rpc/getrpcent.c @@ -257,12 +257,9 @@ static struct rpcent *interpret(register struct rpcdata *d) #if defined(__UCLIBC_HAS_THREADS__) # include static pthread_mutex_t rpcdata_lock = PTHREAD_MUTEX_INITIALIZER; -# define LOCK __pthread_mutex_lock(&rpcdata_lock) -# define UNLOCK __pthread_mutex_unlock(&rpcdata_lock); -#else -# define LOCK -# define UNLOCK #endif +#define LOCK __pthread_mutex_lock(&rpcdata_lock) +#define UNLOCK __pthread_mutex_unlock(&rpcdata_lock) static int __copy_rpcent(struct rpcent *r, struct rpcent *result_buf, char *buffer, size_t buflen, struct rpcent **result) -- cgit v1.2.3