summaryrefslogtreecommitdiff
path: root/libc/inet
diff options
context:
space:
mode:
Diffstat (limited to 'libc/inet')
-rw-r--r--libc/inet/getnetent.c9
-rw-r--r--libc/inet/getproto.c10
-rw-r--r--libc/inet/getservice.c10
-rw-r--r--libc/inet/resolv.c20
-rw-r--r--libc/inet/rpc/create_xid.c9
-rw-r--r--libc/inet/rpc/getrpcent.c7
6 files changed, 23 insertions, 42 deletions
diff --git a/libc/inet/getnetent.c b/libc/inet/getnetent.c
index fc21dfa03..476fa6b0e 100644
--- a/libc/inet/getnetent.c
+++ b/libc/inet/getnetent.c
@@ -24,14 +24,11 @@
#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
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
diff --git a/libc/inet/getproto.c b/libc/inet/getproto.c
index e7221f3a2..a5ebcb3e9 100644
--- a/libc/inet/getproto.c
+++ b/libc/inet/getproto.c
@@ -64,15 +64,13 @@
#include <string.h>
#include <errno.h>
+
#ifdef __UCLIBC_HAS_THREADS__
-#include <pthread.h>
+# include <pthread.h>
static pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-# define LOCK __pthread_mutex_lock(&mylock)
-# define UNLOCK __pthread_mutex_unlock(&mylock);
-#else
-# define LOCK
-# define UNLOCK
#endif
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
diff --git a/libc/inet/getservice.c b/libc/inet/getservice.c
index e4422246b..4040dc9b6 100644
--- a/libc/inet/getservice.c
+++ b/libc/inet/getservice.c
@@ -67,16 +67,12 @@
#include <errno.h>
-
#ifdef __UCLIBC_HAS_THREADS__
-#include <pthread.h>
+# include <pthread.h>
static pthread_mutex_t mylock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-# define LOCK __pthread_mutex_lock(&mylock)
-# define UNLOCK __pthread_mutex_unlock(&mylock);
-#else
-# define LOCK
-# define UNLOCK
#endif
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index ba0fd4674..a6dc549b8 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -186,15 +186,13 @@ extern char * __nameserver[MAX_SERVERS];
extern int __searchdomains;
extern char * __searchdomain[MAX_SEARCH];
+
#ifdef __UCLIBC_HAS_THREADS__
-#include <pthread.h>
+# include <pthread.h>
extern pthread_mutex_t __resolv_lock;
-# define BIGLOCK __pthread_mutex_lock(&__resolv_lock)
-# define BIGUNLOCK __pthread_mutex_unlock(&__resolv_lock);
-#else
-# define BIGLOCK
-# define BIGUNLOCK
#endif
+#define BIGLOCK __pthread_mutex_lock(&__resolv_lock)
+#define BIGUNLOCK __pthread_mutex_unlock(&__resolv_lock)
@@ -659,15 +657,12 @@ int __form_query(int id, const char *name, int type, unsigned char *packet,
#endif
#if defined(L_dnslookup) || defined(L_gethostent)
-
#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
-# define UNLOCK
#endif
+#define LOCK __pthread_mutex_lock(&mylock)
+#define UNLOCK __pthread_mutex_unlock(&mylock)
#endif
#ifdef L_dnslookup
@@ -981,6 +976,7 @@ char * __nameserver[MAX_SERVERS];
int __searchdomains;
char * __searchdomain[MAX_SEARCH];
#ifdef __UCLIBC_HAS_THREADS__
+# include <pthread.h>
pthread_mutex_t __resolv_lock = PTHREAD_MUTEX_INITIALIZER;
#endif
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)