[src/netbsd-2-0]: src Pull up revision 1.21 (requested by jmc in ticket #527):

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7e9a218dafbe
branches:  netbsd-2-0
changeset: 561532:7e9a218dafbe
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:26:01 2004 +0000

description:
Pull up revision 1.21 (requested by jmc in ticket #527):
Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')
Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).
Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.
Fixes PR's: PR#17762 PR#25944

diffstat:

 usr.bin/xlint/lint1/func.c |  8 ++++++--
 usr.sbin/config/util.c     |  6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 6e70a1b9f684 -r 7e9a218dafbe usr.bin/xlint/lint1/func.c
--- a/usr.bin/xlint/lint1/func.c        Tue Jun 22 07:25:39 2004 +0000
+++ b/usr.bin/xlint/lint1/func.c        Tue Jun 22 07:26:01 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $       */
+/*     $NetBSD: func.c,v 1.20.2.1 2004/06/22 07:26:01 tron Exp $       */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -31,9 +31,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $");
+__RCSID("$NetBSD: func.c,v 1.20.2.1 2004/06/22 07:26:01 tron Exp $");
 #endif
 
 #include <stdlib.h>
diff -r 6e70a1b9f684 -r 7e9a218dafbe usr.sbin/config/util.c
--- a/usr.sbin/config/util.c    Tue Jun 22 07:25:39 2004 +0000
+++ b/usr.sbin/config/util.c    Tue Jun 22 07:26:01 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.20 2003/11/25 19:34:06 rafal Exp $  */
+/*     $NetBSD: util.c,v 1.20.2.1 2004/06/22 07:26:01 tron Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *     from: @(#)util.c        8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>