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

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-2-0]: src Pull up revision 1.10 (requested by jmc in ticket #527):
From: tron <tron%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 14:45:05 +0000
details:   https://anonhg.NetBSD.org/src/rev/823f429d61ec
branches:  netbsd-2-0
changeset: 561504:823f429d61ec
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:15:27 2004 +0000

description:
Pull up revision 1.10 (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_utils.c  |  8 ++++++--
 lib/libc/db/hash/hash_func.c  |  8 ++++++--
 lib/libc/db/recno/rec_utils.c |  8 ++++++--
 usr.bin/cksum/print.c         |  8 ++++++--
 usr.bin/ctags/ctags.c         |  8 ++++++--
 usr.bin/ctags/tree.c          |  8 ++++++--
 usr.bin/m4/look.c             |  8 ++++++--
 usr.bin/menuc/main.c          |  8 ++++++--
 usr.bin/rpcgen/rpc_sample.c   |  8 ++++++--
 usr.bin/rpcgen/rpc_util.c     |  8 ++++++--
 10 files changed, 60 insertions(+), 20 deletions(-)

diffs (270 lines):

diff -r 23dcf3414bac -r 823f429d61ec lib/libc/db/btree/bt_utils.c
--- a/lib/libc/db/btree/bt_utils.c      Tue Jun 22 07:15:04 2004 +0000
+++ b/lib/libc/db/btree/bt_utils.c      Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $ */
+/*     $NetBSD: bt_utils.c,v 1.9.2.1 2004/06/22 07:15:27 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_utils.c 8.8 (Berkeley) 7/20/94";
 #else
-__RCSID("$NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $");
+__RCSID("$NetBSD: bt_utils.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec lib/libc/db/hash/hash_func.c
--- a/lib/libc/db/hash/hash_func.c      Tue Jun 22 07:15:04 2004 +0000
+++ b/lib/libc/db/hash/hash_func.c      Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $        */
+/*     $NetBSD: hash_func.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -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_func.c        8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_func.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec lib/libc/db/recno/rec_utils.c
--- a/lib/libc/db/recno/rec_utils.c     Tue Jun 22 07:15:04 2004 +0000
+++ b/lib/libc/db/recno/rec_utils.c     Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $        */
+/*     $NetBSD: rec_utils.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $   */
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -29,12 +29,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[] = "@(#)rec_utils.c        8.6 (Berkeley) 7/16/94";
 #else
-__RCSID("$NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $");
+__RCSID("$NetBSD: rec_utils.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/cksum/print.c
--- a/usr.bin/cksum/print.c     Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/cksum/print.c     Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $ */
+/*     $NetBSD: print.c,v 1.9.2.1 2004/06/22 07:15:27 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[] = "@(#)print.c    8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: print.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/ctags/ctags.c
--- a/usr.bin/ctags/ctags.c     Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/ctags/ctags.c     Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $    */
+/*     $NetBSD: ctags.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $       */
 
 /*
  * Copyright (c) 1987, 1993, 1994, 1995
@@ -29,6 +29,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
@@ -39,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)ctags.c    8.4 (Berkeley) 2/7/95";
 #endif
-__RCSID("$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif /* not lint */
 
 #include <err.h>
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/ctags/tree.c
--- a/usr.bin/ctags/tree.c      Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/ctags/tree.c      Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $     */
+/*     $NetBSD: tree.c,v 1.9.2.1 2004/06/22 07:15:27 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[] = "@(#)tree.c     8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: tree.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/m4/look.c
--- a/usr.bin/m4/look.c Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/m4/look.c Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $     */
+/*     $NetBSD: look.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $        */
 /*     $OpenBSD: look.c,v 1.8 2001/09/17 08:11:13 espie Exp $  */
 
 /*
@@ -33,12 +33,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[] = "@(#)look.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $");
+__RCSID("$NetBSD: look.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/menuc/main.c
--- a/usr.bin/menuc/main.c      Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/menuc/main.c      Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $   */
+/*     $NetBSD: main.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,10 +38,14 @@
 
 /* main.c - main program for menu compiler. */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.9.2.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/rpcgen/rpc_sample.c
--- a/usr.bin/rpcgen/rpc_sample.c       Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/rpcgen/rpc_sample.c       Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $        */
+/*     $NetBSD: rpc_sample.c,v 1.9.4.1 2004/06/22 07:15:27 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_sample.c  1.1  90/08/30  (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_sample.c,v 1.9.4.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif
 
diff -r 23dcf3414bac -r 823f429d61ec usr.bin/rpcgen/rpc_util.c
--- a/usr.bin/rpcgen/rpc_util.c Tue Jun 22 07:15:04 2004 +0000
+++ b/usr.bin/rpcgen/rpc_util.c Tue Jun 22 07:15:27 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $  */
+/*     $NetBSD: rpc_util.c,v 1.9.4.1 2004/06/22 07:15:27 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_util.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $");
+__RCSID("$NetBSD: rpc_util.c,v 1.9.4.1 2004/06/22 07:15:27 tron Exp $");
 #endif
 #endif
Prev by Date: [src/netbsd-2-0]: src/doc Ticket #481 -- fix up sparc64 documentation by addi...
Next by Date: [src/netbsd-2-0]: src Pull up revision 1.19 (requested by jmc in ticket #527):
Previous by Thread: [src/netbsd-2-0]: src/doc Ticket #481 -- fix up sparc64 documentation by addi...
Next by Thread: [src/netbsd-2-0]: src Pull up revision 1.19 (requested by jmc in ticket #527):
Indexes:
Home | Main Index | Thread Index | Old Index