From ae9f75ae846c14c230b202c01a33e14601eb8c43 Mon Sep 17 00:00:00 2001
From: marc <>
Date: Mon, 7 Jun 2004 21:11:23 +0000
Subject: major bump to libc and libpthread to break the dependency of a
 particular implementation of libpthread for libc.  libc no longer needs
 pthread.h to compile. OK millert@, brad@, tedu@

---
 src/lib/libc/net/res_init.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/lib/libc/net/res_init.c')

diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index 9c73958883..79ccada6ee 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $	*/
+/*	$OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -118,9 +118,7 @@ static u_int32_t net_mask(struct in_addr);
 /*
  * Resolver state default settings.
  */
-volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res) = {
-	PTHREAD_ONCE_INIT, 0
-};
+void *__THREAD_NAME(_res);
 
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -128,9 +126,7 @@ struct __res_state _res
 # endif
 	;
 #ifdef INET6
-volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res_ext) = {
-	PTHREAD_ONCE_INIT, 0
-};
+void *__THREAD_NAME(_res_ext);
 
 struct __res_state_ext _res_ext;
 #endif /* INET6 */
-- 
cgit v1.2.3-55-g6feb