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

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

details:   https://anonhg.NetBSD.org/src/rev/b9259a9c50fd
branches:  netbsd-2-0
changeset: 561511:b9259a9c50fd
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:18:03 2004 +0000

description:
Pull up revision 1.13 (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/rpcgen/rpc_clntout.c     |  8 ++++++--
 usr.bin/rpcgen/rpc_parse.c       |  8 ++++++--
 usr.sbin/makefs/ffs/ffs_balloc.c |  8 ++++++--
 usr.sbin/mtree/excludes.c        |  8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diffs (103 lines):

diff -r 2e3cb9d011cd -r b9259a9c50fd usr.bin/rpcgen/rpc_clntout.c
--- a/usr.bin/rpcgen/rpc_clntout.c      Tue Jun 22 07:17:40 2004 +0000
+++ b/usr.bin/rpcgen/rpc_clntout.c      Tue Jun 22 07:18:03 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $      */
+/*     $NetBSD: rpc_clntout.c,v 1.12.4.1 2004/06/22 07:18:03 tron Exp $        */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $");
+__RCSID("$NetBSD: rpc_clntout.c,v 1.12.4.1 2004/06/22 07:18:03 tron Exp $");
 #endif
 #endif
 
diff -r 2e3cb9d011cd -r b9259a9c50fd usr.bin/rpcgen/rpc_parse.c
--- a/usr.bin/rpcgen/rpc_parse.c        Tue Jun 22 07:17:40 2004 +0000
+++ b/usr.bin/rpcgen/rpc_parse.c        Tue Jun 22 07:18:03 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $  */
+/*     $NetBSD: rpc_parse.c,v 1.12.4.1 2004/06/22 07:18:03 tron Exp $  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,12 +29,16 @@
  * Mountain View, California  94043
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $");
+__RCSID("$NetBSD: rpc_parse.c,v 1.12.4.1 2004/06/22 07:18:03 tron Exp $");
 #endif
 #endif
 
diff -r 2e3cb9d011cd -r b9259a9c50fd usr.sbin/makefs/ffs/ffs_balloc.c
--- a/usr.sbin/makefs/ffs/ffs_balloc.c  Tue Jun 22 07:17:40 2004 +0000
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c  Tue Jun 22 07:18:03 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_balloc.c,v 1.12 2003/08/07 11:25:33 agc Exp $      */
+/*     $NetBSD: ffs_balloc.c,v 1.12.2.1 2004/06/22 07:18:03 tron Exp $ */
 /* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
 
 /*
@@ -32,9 +32,13 @@
  *     @(#)ffs_balloc.c        8.8 (Berkeley) 6/16/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_balloc.c,v 1.12 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ffs_balloc.c,v 1.12.2.1 2004/06/22 07:18:03 tron Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
diff -r 2e3cb9d011cd -r b9259a9c50fd usr.sbin/mtree/excludes.c
--- a/usr.sbin/mtree/excludes.c Tue Jun 22 07:17:40 2004 +0000
+++ b/usr.sbin/mtree/excludes.c Tue Jun 22 07:18:03 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: excludes.c,v 1.12 2003/11/17 00:02:33 dbj Exp $        */
+/*     $NetBSD: excludes.c,v 1.12.2.1 2004/06/22 07:18:03 tron Exp $   */
 
 /*
  * Copyright 2000 Massachusetts Institute of Technology
@@ -29,10 +29,14 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: excludes.c,v 1.12 2003/11/17 00:02:33 dbj Exp $");
+__RCSID("$NetBSD: excludes.c,v 1.12.2.1 2004/06/22 07:18:03 tron Exp $");
 #endif
 
 #include <sys/types.h>