diff options
| author |   marc <marc@openbsd.org> | 2004-06-07 21:11:23 +0000 |
|---|---|---|
| committer | marc <marc@openbsd.org> | 2004-06-07 21:11:23 +0000 |
| commit | f91de67f292fa8f5ed29aa37e5f5b87d8645664d (patch) | |
| tree | dab54fdaea4206ab36fc68dc883c9be239ea81d6 /lib/libc/net/res_init.c | |
| parent | Correctly handle an unaligned long long parameter on stack in varargs functions; (diff) | |
| download | wireguard-openbsd-f91de67f292fa8f5ed29aa37e5f5b87d8645664d.tar.xz wireguard-openbsd-f91de67f292fa8f5ed29aa37e5f5b87d8645664d.zip | |
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@
Diffstat (limited to 'lib/libc/net/res_init.c')
| -rw-r--r-- | lib/libc/net/res_init.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index 9c739588836..79ccada6eeb 100644 --- a/lib/libc/net/res_init.c +++ b/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 */ |