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@

3 files changed, 8 insertions, 12 deletions

diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c
index 8fb8975ad8..3db8cc82ee 100644
--- a/src/lib/libc/net/getaddrinfo.c
+++ b/src/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getaddrinfo.c,v 1.49 2004/04/14 07:06:15 itojun Exp $ */
+/*      $OpenBSD: getaddrinfo.c,v 1.50 2004/06/07 21:11:23 marc Exp $   */
 /*      $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $    */
 
 /*
@@ -873,7 +873,7 @@ get_port(ai, servname, matchonly)
         int port;
         int allownumeric;
         /* mutex is defined in getnameinfo.c */
-        extern pthread_mutex_t __THREAD_MUTEX_NAME(serv_mutex);
+        extern void *__THREAD_NAME(serv_mutex);
 
         if (servname == NULL)
                 return 0;
diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c
index da5df507ab..62760e178d 100644
--- a/src/lib/libc/net/getnameinfo.c
+++ b/src/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnameinfo.c,v 1.27 2003/07/21 23:17:53 marc Exp $   */
+/*      $OpenBSD: getnameinfo.c,v 1.28 2004/06/07 21:11:23 marc Exp $   */
 /*      $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $    */
 
 /*
@@ -91,7 +91,7 @@ static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
 /*
  * this mutex is also used by get_port in getaddrinfo.c
  */
-pthread_mutex_t __THREAD_MUTEX_NAME(serv_mutex) = PTHREAD_MUTEX_INITIALIZER;
+void *__THREAD_NAME(serv_mutex);
 
 int
 getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
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 */