From 8d615e14801649271e105df0f420c20902909031 Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Tue, 5 Apr 2016 04:29:21 +0000
Subject: Prefer _MUTEX_*LOCK over _THREAD_PRIVATE_MUTEX_*LOCK() when
 thread-specific data isn't necessary.

ok mpi@, ok&tweak natano@
---
 src/lib/libc/net/res_random.c | 8 ++++----
 src/lib/libc/stdlib/random.c  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/lib/libc/net/res_random.c b/src/lib/libc/net/res_random.c
index 72b9c41a2a..763e420bb8 100644
--- a/src/lib/libc/net/res_random.c
+++ b/src/lib/libc/net/res_random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: res_random.c,v 1.23 2015/10/05 02:57:16 guenther Exp $ */
+/* $OpenBSD: res_random.c,v 1.24 2016/04/05 04:29:21 guenther Exp $ */
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -230,12 +230,12 @@ __res_randomid(void)
 	struct timespec ts;
 	pid_t pid;
 	u_int r;
-	_THREAD_PRIVATE_MUTEX(random);
+	static void *randomid_mutex;
 
 	clock_gettime(CLOCK_MONOTONIC, &ts);
 	pid = getpid();
 
-	_THREAD_PRIVATE_MUTEX_LOCK(random);
+	_MUTEX_LOCK(&randomid_mutex);
 
 	if (ru_counter >= RU_MAX || ts.tv_sec > ru_reseed || pid != ru_pid) {
 		res_initid();
@@ -248,7 +248,7 @@ __res_randomid(void)
 
 	r = permute15(ru_seed ^ pmod(ru_g, ru_seed2 + ru_x, RU_N)) | ru_msb;
 
-	_THREAD_PRIVATE_MUTEX_UNLOCK(random);
+	_MUTEX_UNLOCK(&randomid_mutex);
 
 	return (r);
 }
diff --git a/src/lib/libc/stdlib/random.c b/src/lib/libc/stdlib/random.c
index e293648ecd..41d5f64b58 100644
--- a/src/lib/libc/stdlib/random.c
+++ b/src/lib/libc/stdlib/random.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: random.c,v 1.29 2015/01/16 16:48:51 deraadt Exp $ */
+/*	$OpenBSD: random.c,v 1.30 2016/04/05 04:29:21 guenther Exp $ */
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
@@ -175,11 +175,11 @@ static int rand_sep = SEP_3;
 
 static int random_deterministic;
 
-_THREAD_PRIVATE_MUTEX(random);
+static void *random_mutex;
 static long random_l(void);
 
-#define LOCK() _THREAD_PRIVATE_MUTEX_LOCK(random)
-#define UNLOCK() _THREAD_PRIVATE_MUTEX_UNLOCK(random)
+#define LOCK()		_MUTEX_LOCK(&random_mutex)
+#define UNLOCK()	_MUTEX_UNLOCK(&random_mutex)
 
 /*
  * srandom:
-- 
cgit v1.2.3-55-g6feb