OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolv: Remove the BIND_4_COMPAT macro

This commit is contained in:
Florian Weimer 2016-09-21 16:09:03 +02:00
parent 3a2a1d2cc2
commit 17b09beee7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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]

6
resolv/arpa/nameser.h
View File

@ -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 */

2
resolv/res_comp.c
View File

@ -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>