diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res-state.c | 19 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/resolv/res-state.c b/resolv/res-state.c index e327e34..b0aa22c 100644 --- a/resolv/res-state.c +++ b/resolv/res-state.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 97, 98, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996, 97, 98, 2002, 2003, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,27 +19,10 @@ #include <resolv.h> #include <tls.h> -#if ! USE___THREAD - -# undef _res -extern struct __res_state _res; - -/* When threaded, _res may be a per-thread variable. */ -struct __res_state * -weak_const_function -__res_state (void) -{ - return &_res; -} - -#else struct __res_state * __res_state (void) { return __resp; } - -#endif - libc_hidden_def (__res_state) diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 810fbc8..1f6b3a1 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -126,12 +126,10 @@ struct __res_state _res __attribute__((section (".bss"))); #include <tls.h> -#if USE___THREAD #undef __resp __thread struct __res_state *__resp = &_res; extern __thread struct __res_state *__libc_resp __attribute__ ((alias ("__resp"))) attribute_hidden; -#endif /* We declare this with compat_symbol so that it's not visible at link time. Programs must use the accessor functions. */ |