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

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

details:   https://anonhg.NetBSD.org/src/rev/a9b1885bdb85
branches:  netbsd-2-0
changeset: 561524:a9b1885bdb85
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jun 22 07:23:02 2004 +0000

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

 include/pwd.h              |  4 ++--
 usr.bin/xlint/lint1/decl.c |  8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 3c1069258343 -r a9b1885bdb85 include/pwd.h
--- a/include/pwd.h     Tue Jun 22 07:22:39 2004 +0000
+++ b/include/pwd.h     Tue Jun 22 07:23:02 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pwd.h,v 1.32 2003/10/13 15:36:33 agc Exp $     */
+/*     $NetBSD: pwd.h,v 1.32.2.1 2004/06/22 07:23:02 tron Exp $        */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -68,7 +68,7 @@
 #include <sys/featuretest.h>
 #include <sys/types.h>
 
-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define        _PATH_PASSWD            "/etc/passwd"
 #define        _PATH_MASTERPASSWD      "/etc/master.passwd"
 #define        _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
diff -r 3c1069258343 -r a9b1885bdb85 usr.bin/xlint/lint1/decl.c
--- a/usr.bin/xlint/lint1/decl.c        Tue Jun 22 07:22:39 2004 +0000
+++ b/usr.bin/xlint/lint1/decl.c        Tue Jun 22 07:23:02 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $ */
+/* $NetBSD: decl.c,v 1.32.2.1 2004/06/22 07:23:02 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: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $");
+__RCSID("$NetBSD: decl.c,v 1.32.2.1 2004/06/22 07:23:02 tron Exp $");
 #endif
 
 #include <sys/param.h>