diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 00:37:10 +0000 |
| commit | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch) | |
| tree | cd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/resolv/res_libc.c | |
| parent | 91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff) | |
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/resolv/res_libc.c')
| -rw-r--r-- | libc/resolv/res_libc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libc/resolv/res_libc.c b/libc/resolv/res_libc.c index f1413163d..cba040aea 100644 --- a/libc/resolv/res_libc.c +++ b/libc/resolv/res_libc.c @@ -137,12 +137,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. */ |