diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-28 13:08:53 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-28 13:56:39 +0200 |
| commit | c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb (patch) | |
| tree | 637b7c071241135b9450c4e88218d0260c40787d /resolv | |
| parent | e5a0ec981cc967ac65e9ce288a0412e30b7ae63b (diff) | |
| download | glibc-c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb.tar.gz glibc-c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb.tar.xz glibc-c40226cb4c7f44d9ef58a5eb4c625a3a51a770bb.zip | |
resolv: Remove BSD compatibility conditionals and header
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | resolv/gethnamaddr.c | 55 |
2 files changed, 3 insertions, 58 deletions
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index fb8513ba9b..04f884441b 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -57,11 +57,7 @@ #define BIND_4_COMPAT #include <sys/param.h> -#if (!defined(BSD)) || (BSD < 199306) -# include <sys/bitypes.h> -#else -# include <sys/types.h> -#endif +#include <sys/types.h> #include <sys/cdefs.h> /*% diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index 2c7131392e..1b55ba1ac4 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -66,6 +66,8 @@ #include <resolv.h> #include <ctype.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> #ifndef LOG_AUTH # define LOG_AUTH 0 @@ -73,13 +75,6 @@ #define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */ -#if defined(BSD) && (BSD >= 199103) && defined(AF_INET6) -# include <stdlib.h> -# include <string.h> -#else -# include "../conf/portability.h" -#endif - #if defined(USE_OPTIONS_H) # include <../conf/options.h> #endif @@ -963,49 +958,3 @@ addrsort (char **ap, int num) needsort++; } } - -#if defined(BSD43_BSD43_NFS) || defined(sun) -/* some libc's out there are bound internally to these names (UMIPS) */ -void -ht_sethostent (int stayopen) -{ - _sethtent(stayopen); -} - -void -ht_endhostent (void) -{ - _endhtent(); -} - -struct hostent * -ht_gethostbyname (char *name) -{ - return (_gethtbyname(name)); -} - -struct hostent * -ht_gethostbyaddr (const char *addr, size_t len, int af) -{ - return (_gethtbyaddr(addr, len, af)); -} - -struct hostent * -gethostent (void) -{ - return (_gethtent()); -} - -void -dns_service (void) -{ - return; -} - -#undef dn_skipname -dn_skipname(comp_dn, eom) - const u_char *comp_dn, *eom; -{ - return (__dn_skipname(comp_dn, eom)); -} -#endif /*old-style libc with yp junk in it*/ |