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

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

details:   https://anonhg.NetBSD.org/src/rev/51ff2baf8c8d
branches:  netbsd-2-0
changeset: 561518:51ff2baf8c8d
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:20:43 2004 +0000

description:
Pull up revision 1.9 (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/hash/hash_log2.c |  8 ++++++--
 tools/compat/defs.mk.in      |  4 ++--
 usr.bin/ctags/fortran.c      |  8 ++++++--
 usr.bin/ctags/lisp.c         |  8 ++++++--
 usr.bin/ctags/yacc.c         |  8 ++++++--
 usr.bin/rpcgen/rpc_scan.c    |  8 ++++++--
 usr.bin/xlint/lint2/hash.c   |  8 ++++++--
 usr.bin/xlint/lint2/mem2.c   |  8 ++++++--
 8 files changed, 44 insertions(+), 16 deletions(-)

diffs (201 lines):

diff -r 6284aee60a39 -r 51ff2baf8c8d lib/libc/db/hash/hash_log2.c
--- a/lib/libc/db/hash/hash_log2.c      Tue Jun 22 07:20:18 2004 +0000
+++ b/lib/libc/db/hash/hash_log2.c      Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $        */
+/*     $NetBSD: hash_log2.c,v 1.8.2.1 2004/06/22 07:20:43 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_log2.c        8.2 (Berkeley) 5/31/94";
 #else
-__RCSID("$NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_log2.c,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
diff -r 6284aee60a39 -r 51ff2baf8c8d tools/compat/defs.mk.in
--- a/tools/compat/defs.mk.in   Tue Jun 22 07:20:18 2004 +0000
+++ b/tools/compat/defs.mk.in   Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: defs.mk.in,v 1.8 2003/10/27 00:12:43 lukem Exp $
+#      $NetBSD: defs.mk.in,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $
 
 COMPATOBJ:=    ${.PARSEDIR}
 HOSTEXEEXT=    @EXEEXT@
@@ -14,7 +14,7 @@
 
 HOST_CPPFLAGS+=        -I${COMPATOBJ} -I${COMPATOBJ}/include \
                -I${.CURDIR}/../compat -DHAVE_NBTOOL_CONFIG_H=1 \
-               -D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
+               -D_FILE_OFFSET_BITS=64
 
 DPADD+=                ${COMPATOBJ}/libnbcompat.a
 LDADD+=                -L${COMPATOBJ} -lnbcompat @LIBS@
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/ctags/fortran.c
--- a/usr.bin/ctags/fortran.c   Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/ctags/fortran.c   Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $  */
+/*     $NetBSD: fortran.c,v 1.8.2.1 2004/06/22 07:20:43 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[] = "@(#)fortran.c  8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: fortran.c,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/ctags/lisp.c
--- a/usr.bin/ctags/lisp.c      Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/ctags/lisp.c      Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $     */
+/*     $NetBSD: lisp.c,v 1.8.2.1 2004/06/22 07:20:43 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[] = "@(#)lisp.c     8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: lisp.c,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/ctags/yacc.c
--- a/usr.bin/ctags/yacc.c      Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/ctags/yacc.c      Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $     */
+/*     $NetBSD: yacc.c,v 1.8.2.1 2004/06/22 07:20:43 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[] = "@(#)yacc.c     8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $");
+__RCSID("$NetBSD: yacc.c,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 #endif /* not lint */
 
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/rpcgen/rpc_scan.c
--- a/usr.bin/rpcgen/rpc_scan.c Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/rpcgen/rpc_scan.c Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $  */
+/*     $NetBSD: rpc_scan.c,v 1.8.4.1 2004/06/22 07:20:43 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_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_scan.c,v 1.8.4.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 #endif
 
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/xlint/lint2/hash.c
--- a/usr.bin/xlint/lint2/hash.c        Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/xlint/lint2/hash.c        Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $      */
+/*     $NetBSD: hash.c,v 1.8.4.1 2004/06/22 07:20:43 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: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: hash.c,v 1.8.4.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 
 /*
diff -r 6284aee60a39 -r 51ff2baf8c8d usr.bin/xlint/lint2/mem2.c
--- a/usr.bin/xlint/lint2/mem2.c        Tue Jun 22 07:20:18 2004 +0000
+++ b/usr.bin/xlint/lint2/mem2.c        Tue Jun 22 07:20:43 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $        */
+/*     $NetBSD: mem2.c,v 1.8.2.1 2004/06/22 07:20:43 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: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem2.c,v 1.8.2.1 2004/06/22 07:20:43 tron Exp $");
 #endif
 
 #include <sys/param.h>