diff options
| author | Roland McGrath <roland@gnu.org> | 2002-08-02 03:32:24 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-08-02 03:32:24 +0000 |
| commit | c2afe833521105e05298500ba5d4676d6c833242 (patch) | |
| tree | 226bb6da849fe8d860b766d3c365c8cfeb99b19e /resolv/res_data.c | |
| parent | ae8f7f19faf701667d5e88195e3efc479c4a0746 (diff) | |
| download | glibc-c2afe833521105e05298500ba5d4676d6c833242.zip glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.gz glibc-c2afe833521105e05298500ba5d4676d6c833242.tar.bz2 | |
* sysdeps/pthread/bits/libc-tsd.h: Include <tls.h>.
[USE_TLS && HAVE___THREAD]: Just include the sysdeps/generic file,
which does the right thing when __thread support is available.
* descr.h (struct _pthread_descr_struct) [USE_TLS && HAVE___THREAD]:
Omit `p_libc_specific', `p_errnop', `p_errno', `p_h_errnop',
`p_h_errno', `p_resp', and `p_res' members.
* pthread.c (__pthread_initialize_minimal) [USE_TLS && HAVE___THREAD]:
Don't initialize `p_errnop' and `p_h_errnop' members.
(__pthread_reset_main_thread): Likewise.
(__pthread_initialize_manager): Likewise.
* manager.c (__pthread_manager, pthread_handle_create): Likewise.
* pthread.c (pthread_initialize) [USE_TLS && HAVE___THREAD]:
Don't initialize `p_resp' member.
(__pthread_reset_main_thread): Likewise.
* manager.c (pthread_handle_create): Likewise.
* specific.c (libc_internal_tsd_set, libc_internal_tsd_get):
Conditionalize these on [!(USE_TLS && HAVE___THREAD)].
* errno.c [USE_TLS && HAVE___THREAD]
(__h_errno_location, __res_state): Don't define these at all.
* sysdeps/i386/tls.h (INSTALL_DTV): Add parens around arguments!
(INSTALL_NEW_DTV, GET_DTV): Likewise.
* sysdeps/sh/tls.h (INSTALL_DTV, INSTALL_NEW_DTV, GET_DTV): Likewise.
* weaks.c: Don't include <errno.h> here.
2002-08-01 Roland McGrath <roland@redhat.com>
* sysdeps/i386/tls.h (TLS_DO_MODIFY_LDT): New macro, broken out of
TLS_INIT_TP.
(TLS_DO_SET_THREAD_AREA): New macro, uses thread_set_area syscall.
(TLS_SETUP_GS_SEGMENT): New macro, try one or the other or both.
(TLS_INIT_TP): Use that.
Diffstat (limited to 'resolv/res_data.c')
| -rw-r--r-- | resolv/res_data.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/resolv/res_data.c b/resolv/res_data.c index 6aa697a..7488ba7 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -39,8 +39,6 @@ static const char rcsid[] = "$BINDId: res_data.c,v 8.17 1999/10/13 17:11:31 vixi #include <string.h> #include <unistd.h> -#undef _res - const char *_res_opcodes[] = { "QUERY", "IQUERY", @@ -71,9 +69,9 @@ const char *_res_sectioncodes[] = { #ifndef __BIND_NOSTATIC #ifdef _LIBC -extern struct __res_state _res; -#else /* The definition has been moved to res_libc.c. */ +#else +#undef _res struct __res_state _res # if defined(__BIND_RES_TEXT) = { RES_TIMEOUT, } /* Motorola, et al. */ |