summaryrefslogtreecommitdiff
path: root/nptl/res.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-22 23:10:17 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-22 23:10:17 +0000
commit0e9d624072fd24ee7d113bcf9325e8fb21d2cf60 (patch)
treec1185e3d74e8db6363798cf48b9b83bd71ef568d /nptl/res.c
parent11bf8ce1d6c28b4758cedeaea9558f6a071fe7d8 (diff)
Update.
2003-07-22 Jakub Jelinek <jakub@redhat.com> * include/resolv.h (__resp): Declare. Define to __libc_resp if in libc.so. (_res): If USE___THREAD, define to (*__resp). * resolv/res_libc.c (_res): Normal .bss variable with compat_symbol even if USE___THREAD. (__resp): New __thread variable. (__libc_resp): New alias. * resolv/Versions (libc): Export _res@GLIBC_2.0 even if USE_TLS && HAVE___THREAD. Export __resp@@GLIBC_PRIVATE. * sysdeps/generic/res-state.c (__res_state): Return __resp if USE___THREAD.
Diffstat (limited to 'nptl/res.c')
-rw-r--r--nptl/res.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/nptl/res.c b/nptl/res.c
index 6c2e3f8867..ba4f81d06f 100644
--- a/nptl/res.c
+++ b/nptl/res.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 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
@@ -18,16 +18,10 @@
#include <features.h>
#include <resolv.h>
-#undef _res
-
#include <tls.h>
-/* With __thread support, this per-thread variable is used in all cases. */
-extern __thread struct __res_state _res;
-
-
struct __res_state *
__res_state (void)
{
- return &_res;
+ return __resp;
}