This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Remove the BIND_4_COMPAT macro
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Fri, 09 Sep 2016 13:43:10 +0200
- Subject: [PATCH] Remove the BIND_4_COMPAT macro
- Authentication-results: sourceware.org; auth=none
2016-09-09 Florian Weimer <fweimer@redhat.com>
Remove the always-defined BIND_4_COMPAT macro.
* resolv/arpa/nameser.h: Unconditioally include
<arpa/nameser_compat.h>.
(BIND_4_COMPAT): Remove.
* resolv/res_comp.c: Do not check BIND_4_COMPAT.
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index cdbec23..884affa 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -52,10 +52,6 @@
#ifndef _ARPA_NAMESER_H_
#define _ARPA_NAMESER_H_
-/*! \file */
-
-#define BIND_4_COMPAT
-
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
@@ -420,9 +416,7 @@ int ns_makecanon (const char *, char *, size_t) __THROW;
int ns_samename (const char *, const char *) __THROW;
__END_DECLS
-#ifdef BIND_4_COMPAT
#include <arpa/nameser_compat.h>
-#endif
#endif /* !_ARPA_NAMESER_H_ */
/*! \file */
diff --git a/resolv/res_comp.c b/resolv/res_comp.c
index d2be5e4..ffb2ed5 100644
--- a/resolv/res_comp.c
+++ b/resolv/res_comp.c
@@ -228,7 +228,6 @@ res_dnok(const char *dn) {
}
libresolv_hidden_def (res_dnok)
-#ifdef BIND_4_COMPAT
/*
* This module must export the following externally-visible symbols:
* ___putlong
@@ -243,7 +242,6 @@ void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
libresolv_hidden_def (__putshort)
u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*BIND_4_COMPAT*/
#include <shlib-compat.h>