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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-2-0]: src Pull up revision 1.14 (requested by jmc in ticket #527):
From: tron <tron%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 14:45:09 +0000

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

description:
Pull up revision 1.14 (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/emit1.c         |  8 ++++++--
 usr.bin/xlint/lint2/read.c          |  8 ++++++--
 usr.sbin/config/hash.c              |  6 +++++-
 usr.sbin/installboot/arch/sparc64.c |  8 ++++++--
 usr.sbin/makefs/ffs/ffs_alloc.c     |  8 ++++++--
 usr.sbin/makefs/ffs/ufs_bmap.c      |  8 ++++++--
 usr.sbin/makefs/makefs.h            |  4 ++--
 7 files changed, 37 insertions(+), 13 deletions(-)

diffs (158 lines):

diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.bin/xlint/lint1/emit1.c
--- a/usr.bin/xlint/lint1/emit1.c       Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.bin/xlint/lint1/emit1.c       Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $ */
+/* $NetBSD: emit1.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,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: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $");
 #endif
 
 #include <ctype.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.bin/xlint/lint2/read.c
--- a/usr.bin/xlint/lint2/read.c        Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.bin/xlint/lint2/read.c        Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $ */
+/* $NetBSD: read.c,v 1.13.4.1 2004/06/22 07:18:49 tron Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -32,9 +32,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: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $");
+__RCSID("$NetBSD: read.c,v 1.13.4.1 2004/06/22 07:18:49 tron Exp $");
 #endif
 
 #include <ctype.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.sbin/config/hash.c
--- a/usr.sbin/config/hash.c    Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.sbin/config/hash.c    Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash.c,v 1.13 2003/11/25 19:34:05 rafal Exp $  */
+/*     $NetBSD: hash.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,6 +40,10 @@
  *     from: @(#)hash.c        8.1 (Berkeley) 6/6/93
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.sbin/installboot/arch/sparc64.c
--- a/usr.sbin/installboot/arch/sparc64.c       Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.sbin/installboot/arch/sparc64.c       Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sparc64.c,v 1.13 2002/05/15 02:18:24 lukem Exp $       */
+/*     $NetBSD: sparc64.c,v 1.13.4.1 2004/06/22 07:18:49 tron Exp $    */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -64,9 +64,13 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: sparc64.c,v 1.13 2002/05/15 02:18:24 lukem Exp $");
+__RCSID("$NetBSD: sparc64.c,v 1.13.4.1 2004/06/22 07:18:49 tron Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.sbin/makefs/ffs/ffs_alloc.c
--- a/usr.sbin/makefs/ffs/ffs_alloc.c   Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c   Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_alloc.c,v 1.13 2003/08/07 11:25:33 agc Exp $       */
+/*     $NetBSD: ffs_alloc.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $  */
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 
 /*
@@ -41,9 +41,13 @@
  *     @(#)ffs_alloc.c 8.19 (Berkeley) 7/13/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.13 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.sbin/makefs/ffs/ufs_bmap.c
--- a/usr.sbin/makefs/ffs/ufs_bmap.c    Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c    Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_bmap.c,v 1.13 2003/08/07 11:25:33 agc Exp $        */
+/*     $NetBSD: ufs_bmap.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $   */
 /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
 
 /*
@@ -37,9 +37,13 @@
  *     @(#)ufs_bmap.c  8.8 (Berkeley) 8/11/95
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ufs_bmap.c,v 1.13 2003/08/07 11:25:33 agc Exp $");
+__RCSID("$NetBSD: ufs_bmap.c,v 1.13.2.1 2004/06/22 07:18:49 tron Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
diff -r eb8099145cd0 -r 6ce5056dc2e1 usr.sbin/makefs/makefs.h
--- a/usr.sbin/makefs/makefs.h  Tue Jun 22 07:18:25 2004 +0000
+++ b/usr.sbin/makefs/makefs.h  Tue Jun 22 07:18:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makefs.h,v 1.12 2003/10/27 00:12:44 lukem Exp $        */
+/*     $NetBSD: makefs.h,v 1.12.2.1 2004/06/22 07:18:49 tron Exp $     */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -183,7 +183,7 @@
 
 
 
-extern uint            debug;
+extern u_int           debug;
 extern struct timespec start_time;
 
 /*

Prev by Date: [src/netbsd-2-0]: src/usr.sbin/config Pull up revision 1.94 (requested by jmc...
Next by Date: [src/netbsd-2-0]: src Pull up revision 1.6 (requested by jmc in ticket #527):
Previous by Thread: [src/netbsd-2-0]: src/usr.sbin/config Pull up revision 1.94 (requested by jmc...
Next by Thread: [src/netbsd-2-0]: src Pull up revision 1.6 (requested by jmc in ticket #527):
Indexes:

Home | Main Index | Thread Index | Old Index