diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-28 11:01:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-28 12:53:49 +0200 |
| commit | c99c925b8b7ce7d023943878a41ad964c5ab7a04 (patch) | |
| tree | d7310120ea798bd0b67fbc1297008facc904a5b1 /resolv/res_init.c | |
| parent | 1f32be054b640fa7bcbc46441e24e185ab5184e3 (diff) | |
| download | glibc-c99c925b8b7ce7d023943878a41ad964c5ab7a04.tar glibc-c99c925b8b7ce7d023943878a41ad964c5ab7a04.tar.gz glibc-c99c925b8b7ce7d023943878a41ad964c5ab7a04.tar.bz2 glibc-c99c925b8b7ce7d023943878a41ad964c5ab7a04.zip | |
resolv: Remove _LIBC conditionals
Diffstat (limited to 'resolv/res_init.c')
| -rw-r--r-- | resolv/res_init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/resolv/res_init.c b/resolv/res_init.c index 4fb7f1eb64..de96d84b5d 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -102,9 +102,7 @@ static u_int32_t net_mask (struct in_addr) __THROW; # define isascii(c) (!(c & 0200)) #endif -#ifdef _LIBC unsigned long long int __res_initstamp attribute_hidden; -#endif /* * Resolver state default settings. @@ -123,9 +121,7 @@ res_ninit(res_state statp) { return (__res_vinit(statp, 0)); } -#ifdef _LIBC libc_hidden_def (__res_ninit) -#endif /* This function has to be reachable by res_data.c but not publically. */ int @@ -145,9 +141,7 @@ __res_vinit(res_state statp, int preinit) { #ifndef RFC1535 int dots; #endif -#ifdef _LIBC statp->_u._ext.initstamp = __res_initstamp; -#endif if (!preinit) { statp->retrans = RES_TIMEOUT; @@ -283,7 +277,6 @@ __res_vinit(res_state statp, int preinit) { statp->nsaddr_list[nserv].sin_port = htons(NAMESERVER_PORT); nserv++; -#ifdef _LIBC } else { struct in6_addr a6; char *el; @@ -332,7 +325,6 @@ __res_vinit(res_state statp, int preinit) { nserv++; } } -#endif } continue; } @@ -385,12 +377,10 @@ __res_vinit(res_state statp, int preinit) { } } statp->nscount = nserv; -#ifdef _LIBC if (have_serv6) { /* We try IPv6 servers again. */ statp->ipv6_unavail = false; } -#endif #ifdef RESOLVSORT statp->nsort = nsort; #endif @@ -554,9 +544,7 @@ u_int res_randomid(void) { return 0xffff & __getpid(); } -#ifdef _LIBC libc_hidden_def (__res_randomid) -#endif /* @@ -594,11 +582,8 @@ res_nclose(res_state statp) { __res_iclose (statp, true); } -#ifdef _LIBC libc_hidden_def (__res_nclose) -#endif -#ifdef _LIBC # ifdef _LIBC_REENTRANT /* This is called when a thread is exiting to free resources held in _res. */ static void __attribute__ ((section ("__libc_thread_freeres_fn"))) @@ -616,4 +601,3 @@ res_thread_freeres (void) text_set_element (__libc_thread_subfreeres, res_thread_freeres); text_set_element (__libc_subfreeres, res_thread_freeres); # endif -#endif |