diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-28 11:53:00 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-28 13:56:38 +0200 |
| commit | e5a0ec981cc967ac65e9ce288a0412e30b7ae63b (patch) | |
| tree | 545a17e1ef06e6f3c26ecd58318dcfc214bd4497 | |
| parent | 687c1c0ce27de3a6852c1c02d321f65100d96c5d (diff) | |
| download | glibc-e5a0ec981cc967ac65e9ce288a0412e30b7ae63b.tar.gz | |
resolv: Remove __BIND_NOSTATIC conditionals
The macro is never defined.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_data.c | 2 | ||||
| -rw-r--r-- | resolv/resolv.h | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/resolv.h: Remove __BIND_NOSTATIC conditional. + * resolv/res_data.c: Likewise. + +2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/res_comp.c: Remove code conditional on __ultrix__. * resolv/res_data.c: Remove code conditional on ultrix. diff --git a/resolv/res_data.c b/resolv/res_data.c index 7e848e0945..f44c517062 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -52,7 +52,6 @@ const char *_res_opcodes[] = { }; libresolv_hidden_data_def (_res_opcodes) -#ifndef __BIND_NOSTATIC void p_query(const u_char *msg) { fp_query(msg, stdout); @@ -186,7 +185,6 @@ hostalias(const char *name) { } libresolv_hidden_def (hostalias) -#endif #include <shlib-compat.h> diff --git a/resolv/resolv.h b/resolv/resolv.h index 53c3bba182..f55e7ceaba 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -250,7 +250,6 @@ extern struct __res_state *__res_state(void) __attribute__ ((__const__)); __END_DECLS #define _res (*__res_state()) -#ifndef __BIND_NOSTATIC #define fp_nquery __fp_nquery #define fp_query __fp_query #define hostalias __hostalias @@ -280,7 +279,6 @@ int res_querydomain (const char *, const char *, int, int, int res_search (const char *, int, int, u_char *, int) __THROW; int res_send (const u_char *, int, u_char *, int) __THROW; __END_DECLS -#endif #define b64_ntop __b64_ntop #define b64_pton __b64_pton |