summaryrefslogtreecommitdiff
path: root/libc/inet/rpc
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-12-06 01:29:10 +0000
committerMike Frysinger <vapier@gentoo.org>2005-12-06 01:29:10 +0000
commitaab07d0500d06e1de93280cb9900b24fd0c0875b (patch)
tree7122ec94b0498c150b69401a13f06aaea803cf50 /libc/inet/rpc
parent680f8428162687caae571090e008b42d18f2bb5a (diff)
macro out the thread funcs in libc if threading is disabled
Diffstat (limited to 'libc/inet/rpc')
-rw-r--r--libc/inet/rpc/create_xid.c9
-rw-r--r--libc/inet/rpc/getrpcent.c7
2 files changed, 5 insertions, 11 deletions
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 <pthread.h>
+# include <pthread.h>
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 <pthread.h>
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)