From 8011d4268d79e6a1701c6c64b3e1367aca696145 Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 10 Oct 2020 19:51:48 +0000 Subject: - remove bitypes.h fossil - define u_{char,short,int,long} if we don't have _NETBSD_SOURCE defined so that this compiles (and resolv.h since it includes this). This is the simplest solution. Others: - always define them (bad, pollutes namespace) - create (bad, overkill) - change them to unsigned {char, short, int long} (bad, too disruptive) --- include/arpa/nameser.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 1fcdbb9379b..848e9da9d4c 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,4 +1,4 @@ -/* $NetBSD: nameser.h,v 1.25 2009/04/12 17:07:34 christos Exp $ */ +/* $NetBSD: nameser.h,v 1.26 2020/10/10 19:51:48 christos Exp $ */ /* * Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") @@ -56,13 +56,16 @@ #define BIND_4_COMPAT #include -#if (!defined(BSD)) || (BSD < 199306) -# include -#else -# include -#endif +#include #include +#if !defined(_NETBSD_SOURCE) +typedef unsigned char u_char; +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; +#endif + /*% * Revision information. This is the release date in YYYYMMDD format. * It can change every day so the right thing to do with it is use it -- cgit