diff options
Diffstat (limited to 'src/lib/libc/net/res_init.c')
-rw-r--r-- | src/lib/libc/net/res_init.c | 12 |
1 files changed, 4 insertions, 8 deletions
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 @@ | |||
1 | /* $OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $ */ | 1 | /* $OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * ++Copyright++ 1985, 1989, 1993 | 4 | * ++Copyright++ 1985, 1989, 1993 |
@@ -60,7 +60,7 @@ | |||
60 | static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; | 60 | static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; |
61 | static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $"; | 61 | static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $"; |
62 | #else | 62 | #else |
63 | static char rcsid[] = "$OpenBSD: res_init.c,v 1.29 2003/06/02 20:18:36 millert Exp $"; | 63 | static char rcsid[] = "$OpenBSD: res_init.c,v 1.30 2004/06/07 21:11:23 marc Exp $"; |
64 | #endif | 64 | #endif |
65 | #endif /* LIBC_SCCS and not lint */ | 65 | #endif /* LIBC_SCCS and not lint */ |
66 | 66 | ||
@@ -118,9 +118,7 @@ static u_int32_t net_mask(struct in_addr); | |||
118 | /* | 118 | /* |
119 | * Resolver state default settings. | 119 | * Resolver state default settings. |
120 | */ | 120 | */ |
121 | volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res) = { | 121 | void *__THREAD_NAME(_res); |
122 | PTHREAD_ONCE_INIT, 0 | ||
123 | }; | ||
124 | 122 | ||
125 | struct __res_state _res | 123 | struct __res_state _res |
126 | # if defined(__BIND_RES_TEXT) | 124 | # if defined(__BIND_RES_TEXT) |
@@ -128,9 +126,7 @@ struct __res_state _res | |||
128 | # endif | 126 | # endif |
129 | ; | 127 | ; |
130 | #ifdef INET6 | 128 | #ifdef INET6 |
131 | volatile struct _thread_private_key_struct __THREAD_KEY_NAME(_res_ext) = { | 129 | void *__THREAD_NAME(_res_ext); |
132 | PTHREAD_ONCE_INIT, 0 | ||
133 | }; | ||
134 | 130 | ||
135 | struct __res_state_ext _res_ext; | 131 | struct __res_state_ext _res_ext; |
136 | #endif /* INET6 */ | 132 | #endif /* INET6 */ |