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

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

details:   https://anonhg.NetBSD.org/src/rev/000a5f11b5a4
branches:  netbsd-2-0
changeset: 561507:000a5f11b5a4
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:16:34 2004 +0000

description:
Pull up revision 1.11 (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:

 lib/libc/db/btree/bt_conv.c  |  8 ++++++--
 lib/libc/db/btree/bt_debug.c |  8 ++++++--
 lib/libc/db/hash/hash_buf.c  |  8 ++++++--
 usr.bin/cksum/sum1.c         |  8 ++++++--
 usr.bin/cksum/sum2.c         |  8 ++++++--
 usr.bin/ctags/C.c            |  8 ++++++--
 usr.bin/rpcgen/rpc_tblout.c  |  8 ++++++--
 usr.bin/xlint/lint1/mem1.c   |  8 ++++++--
 8 files changed, 48 insertions(+), 16 deletions(-)

diffs (213 lines):

diff -r c5055dab07ca -r 000a5f11b5a4 lib/libc/db/btree/bt_conv.c
--- a/lib/libc/db/btree/bt_conv.c       Tue Jun 22 07:16:11 2004 +0000
+++ b/lib/libc/db/btree/bt_conv.c       Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $ */
+/*     $NetBSD: bt_conv.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $    */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_conv.c  8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_conv.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 lib/libc/db/btree/bt_debug.c
--- a/lib/libc/db/btree/bt_debug.c      Tue Jun 22 07:16:11 2004 +0000
+++ b/lib/libc/db/btree/bt_debug.c      Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $        */
+/*     $NetBSD: bt_debug.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_debug.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 lib/libc/db/hash/hash_buf.c
--- a/lib/libc/db/hash/hash_buf.c       Tue Jun 22 07:16:11 2004 +0000
+++ b/lib/libc/db/hash/hash_buf.c       Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $        */
+/*     $NetBSD: hash_buf.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -32,12 +32,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94";
 #else
-__RCSID("$NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_buf.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 usr.bin/cksum/sum1.c
--- a/usr.bin/cksum/sum1.c      Tue Jun 22 07:16:11 2004 +0000
+++ b/usr.bin/cksum/sum1.c      Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $ */
+/*     $NetBSD: sum1.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum1.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum1.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 usr.bin/cksum/sum2.c
--- a/usr.bin/cksum/sum2.c      Tue Jun 22 07:16:11 2004 +0000
+++ b/usr.bin/cksum/sum2.c      Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $ */
+/*     $NetBSD: sum2.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $       */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum2.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum2.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 usr.bin/ctags/C.c
--- a/usr.bin/ctags/C.c Tue Jun 22 07:16:11 2004 +0000
+++ b/usr.bin/ctags/C.c Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $       */
+/*     $NetBSD: C.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $  */
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -29,12 +29,16 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)C.c        8.4 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: C.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r c5055dab07ca -r 000a5f11b5a4 usr.bin/rpcgen/rpc_tblout.c
--- a/usr.bin/rpcgen/rpc_tblout.c       Tue Jun 22 07:16:11 2004 +0000
+++ b/usr.bin/rpcgen/rpc_tblout.c       Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $ */
+/*     $NetBSD: rpc_tblout.c,v 1.10.4.1 2004/06/22 07:16:34 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_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #else
-__RCSID("$NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $");
+__RCSID("$NetBSD: rpc_tblout.c,v 1.10.4.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 #endif
 
diff -r c5055dab07ca -r 000a5f11b5a4 usr.bin/xlint/lint1/mem1.c
--- a/usr.bin/xlint/lint1/mem1.c        Tue Jun 22 07:16:11 2004 +0000
+++ b/usr.bin/xlint/lint1/mem1.c        Tue Jun 22 07:16:34 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $       */
+/*     $NetBSD: mem1.c,v 1.10.2.1 2004/06/22 07:16:34 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: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.10.2.1 2004/06/22 07:16:34 tron Exp $");
 #endif
 
 #include <sys/types.h>