AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Remove __BIND_NOSTATIC conditionals

Browse Source 
The macro is never defined.
This commit is contained in:
Florian Weimer 2016-04-28 11:53:00 +02:00
parent 687c1c0ce2
commit e5a0ec981c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2016-04-28 Florian Weimer <fweimer@redhat.com>
* resolv/res_comp.c: Remove code conditional on __ultrix__. * resolv/res_comp.c: Remove code conditional on __ultrix__.

2
resolv/res_data.c
View File

@ -52,7 +52,6 @@ const char *_res_opcodes[] = {
}; };
libresolv_hidden_data_def (_res_opcodes) libresolv_hidden_data_def (_res_opcodes)
#ifndef __BIND_NOSTATIC
void void
p_query(const u_char *msg) { p_query(const u_char *msg) {
fp_query(msg, stdout); fp_query(msg, stdout);
@ -186,7 +185,6 @@ hostalias(const char *name) {
} }
libresolv_hidden_def (hostalias) libresolv_hidden_def (hostalias)
#endif
#include <shlib-compat.h> #include <shlib-compat.h>

2
resolv/resolv.h
View File

@ -250,7 +250,6 @@ extern struct __res_state *__res_state(void) __attribute__ ((__const__));
__END_DECLS __END_DECLS
#define _res (*__res_state()) #define _res (*__res_state())
#ifndef __BIND_NOSTATIC
#define fp_nquery __fp_nquery #define fp_nquery __fp_nquery
#define fp_query __fp_query #define fp_query __fp_query
#define hostalias __hostalias #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_search (const char *, int, int, u_char *, int) __THROW;
int res_send (const u_char *, int, u_char *, int) __THROW; int res_send (const u_char *, int, u_char *, int) __THROW;
__END_DECLS __END_DECLS
#endif
#define b64_ntop __b64_ntop #define b64_ntop __b64_ntop
#define b64_pton __b64_pton #define b64_pton __b64_pton