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

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

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

description:
Pull up revision 1.7 (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/msgc/msgmain.c         |  8 ++++++--
 usr.bin/xlint/common/mem.c     |  8 ++++++--
 usr.bin/xlint/lint2/main2.c    |  8 ++++++--
 usr.sbin/installboot/fstypes.c |  8 ++++++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diffs (97 lines):

diff -r 6ce5056dc2e1 -r 7c4bccc782ef usr.bin/msgc/msgmain.c
--- a/usr.bin/msgc/msgmain.c    Tue Jun 22 07:18:49 2004 +0000
+++ b/usr.bin/msgc/msgmain.c    Tue Jun 22 07:19:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $        */
+/*     $NetBSD: msgmain.c,v 1.6.2.1 2004/06/22 07:19:12 tron Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* main.c - main program */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $");
+__RCSID("$NetBSD: msgmain.c,v 1.6.2.1 2004/06/22 07:19:12 tron Exp $");
 #endif
 
 
diff -r 6ce5056dc2e1 -r 7c4bccc782ef usr.bin/xlint/common/mem.c
--- a/usr.bin/xlint/common/mem.c        Tue Jun 22 07:18:49 2004 +0000
+++ b/usr.bin/xlint/common/mem.c        Tue Jun 22 07:19:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $ */
+/*     $NetBSD: mem.c,v 1.6.2.1 2004/06/22 07:19:12 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: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $");
+__RCSID("$NetBSD: mem.c,v 1.6.2.1 2004/06/22 07:19:12 tron Exp $");
 #endif
 
 #include <sys/param.h>
diff -r 6ce5056dc2e1 -r 7c4bccc782ef usr.bin/xlint/lint2/main2.c
--- a/usr.bin/xlint/lint2/main2.c       Tue Jun 22 07:18:49 2004 +0000
+++ b/usr.bin/xlint/lint2/main2.c       Tue Jun 22 07:19:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $     */
+/*     $NetBSD: main2.c,v 1.6.4.1 2004/06/22 07:19:12 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: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: main2.c,v 1.6.4.1 2004/06/22 07:19:12 tron Exp $");
 #endif
 
 #include <stdio.h>
diff -r 6ce5056dc2e1 -r 7c4bccc782ef usr.sbin/installboot/fstypes.c
--- a/usr.sbin/installboot/fstypes.c    Tue Jun 22 07:18:49 2004 +0000
+++ b/usr.sbin/installboot/fstypes.c    Tue Jun 22 07:19:12 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fstypes.c,v 1.6 2003/07/27 07:51:40 lukem Exp $        */
+/*     $NetBSD: fstypes.c,v 1.6.2.1 2004/06/22 07:19:12 tron Exp $     */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,9 +36,13 @@
  * 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: fstypes.c,v 1.6 2003/07/27 07:51:40 lukem Exp $");
+__RCSID("$NetBSD: fstypes.c,v 1.6.2.1 2004/06/22 07:19:12 tron Exp $");
 #endif /* !__lint */
 
 #include <sys/types.h>