diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-09-05 22:41:05 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-09-05 22:41:05 +0000 |
| commit | 2c1d357a5fe5bdc4c9521a9d1af05ba1b5a4c238 (patch) | |
| tree | 12e23fa555f1432064e8fdeeb063dce798764f50 /libc/include/resolv.h | |
| parent | 0d983ceeeee6bd20ae296d224ca2fd4bf27a47af (diff) | |
Merge changes between r23795 and r23927 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23928 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/include/resolv.h')
| -rw-r--r-- | libc/include/resolv.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libc/include/resolv.h b/libc/include/resolv.h index 30ea8776b..87b359833 100644 --- a/libc/include/resolv.h +++ b/libc/include/resolv.h @@ -13,20 +13,12 @@ #ifdef _RESOLV_H_ -# ifdef _LIBC_REENTRANT -# include <tls.h> -# undef _res -# ifndef NOT_IN_libc -# define __resp __libc_resp -# endif -# define _res (*__resp) -extern __thread struct __res_state *__resp attribute_tls_model_ie; -# else -# ifndef __BIND_NOSTATIC -# undef _res -extern struct __res_state _res; -# endif +# ifndef NOT_IN_libc +# define __resp __libc_resp # endif +extern __thread struct __res_state *__resp attribute_tls_model_ie; +# undef _res +# define _res (*__resp) /* Now define the internal interfaces. */ extern int __res_vinit (res_state, int); |