From 17b09beee7a98265440267d49625808bbfd734f9 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 21 Sep 2016 16:09:03 +0200
Subject: [PATCH] resolv: Remove the BIND_4_COMPAT macro

---
 ChangeLog             | 8 ++++++++
 resolv/arpa/nameser.h | 6 ------
 resolv/res_comp.c     | 2 --
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efa0af514e..5da8103b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-09-21  Florian Weimer  <fweimer@redhat.com>
+
+	Remove the always-defined BIND_4_COMPAT macro.
+	* resolv/arpa/nameser.h: Unconditionally include
+	<arpa/nameser_compat.h>.
+	(BIND_4_COMPAT): Remove.
+	* resolv/res_comp.c: Do not check BIND_4_COMPAT.
+
 2016-09-21  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #20591]
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index cdbec23ce3..884affae2f 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 d2be5e4560..ffb2ed5914 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>
-- 
2.43.5