Module Name: src
Committed By: kalvisd
Date: Tue Dec 3 05:57:02 UTC 2024
Modified Files:
src/usr.sbin/mopd/common: cmp.c file.c get.c log.c mopdef.c nma.c
src/usr.sbin/mopd/mopcopy: mopcopy.c
Log Message:
usr.sbin/mopd: When building the vax-mopcopy host tool,
preferentially include "nbtool_config.h" over "port.h"
OK rin@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/mopd/common/cmp.c \
src/usr.sbin/mopd/common/mopdef.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/mopd/common/file.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mopd/common/get.c \
src/usr.sbin/mopd/common/nma.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/mopd/common/log.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/mopd/mopcopy/mopcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/common/cmp.c
diff -u src/usr.sbin/mopd/common/cmp.c:1.6 src/usr.sbin/mopd/common/cmp.c:1.7
--- src/usr.sbin/mopd/common/cmp.c:1.6 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/cmp.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cmp.c,v 1.6 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: cmp.c,v 1.7 2024/12/03 05:57:02 kalvisd Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,9 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: cmp.c,v 1.6 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: cmp.c,v 1.7 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include "os.h"
Index: src/usr.sbin/mopd/common/mopdef.c
diff -u src/usr.sbin/mopd/common/mopdef.c:1.6 src/usr.sbin/mopd/common/mopdef.c:1.7
--- src/usr.sbin/mopd/common/mopdef.c:1.6 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/mopdef.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mopdef.c,v 1.6 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: mopdef.c,v 1.7 2024/12/03 05:57:02 kalvisd Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,9 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: mopdef.c,v 1.6 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: mopdef.c,v 1.7 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#define MOPDEF_SURPESS_EXTERN
Index: src/usr.sbin/mopd/common/file.c
diff -u src/usr.sbin/mopd/common/file.c:1.19 src/usr.sbin/mopd/common/file.c:1.20
--- src/usr.sbin/mopd/common/file.c:1.19 Wed Oct 23 00:45:58 2024
+++ src/usr.sbin/mopd/common/file.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: file.c,v 1.19 2024/10/23 00:45:58 kalvisd Exp $ */
+/* $NetBSD: file.c,v 1.20 2024/12/03 05:57:02 kalvisd Exp $ */
/*
* Copyright (c) 1995-96 Mats O Jansson. All rights reserved.
@@ -24,9 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: file.c,v 1.19 2024/10/23 00:45:58 kalvisd Exp $");
+__RCSID("$NetBSD: file.c,v 1.20 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include "os.h"
Index: src/usr.sbin/mopd/common/get.c
diff -u src/usr.sbin/mopd/common/get.c:1.7 src/usr.sbin/mopd/common/get.c:1.8
--- src/usr.sbin/mopd/common/get.c:1.7 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/get.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: get.c,v 1.7 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: get.c,v 1.8 2024/12/03 05:57:02 kalvisd Exp $ */
/*
* Copyright (c) 1993-95 Mats O Jansson. All rights reserved.
@@ -24,9 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: get.c,v 1.7 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: get.c,v 1.8 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include "os.h"
Index: src/usr.sbin/mopd/common/nma.c
diff -u src/usr.sbin/mopd/common/nma.c:1.7 src/usr.sbin/mopd/common/nma.c:1.8
--- src/usr.sbin/mopd/common/nma.c:1.7 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/nma.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: nma.c,v 1.7 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: nma.c,v 1.8 2024/12/03 05:57:02 kalvisd Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson. All rights reserved.
@@ -24,9 +24,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: nma.c,v 1.7 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: nma.c,v 1.8 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include "os.h"
Index: src/usr.sbin/mopd/common/log.c
diff -u src/usr.sbin/mopd/common/log.c:1.4 src/usr.sbin/mopd/common/log.c:1.5
--- src/usr.sbin/mopd/common/log.c:1.4 Wed Jun 8 01:11:49 2016
+++ src/usr.sbin/mopd/common/log.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.4 2016/06/08 01:11:49 christos Exp $ */
+/* $NetBSD: log.c,v 1.5 2024/12/03 05:57:02 kalvisd Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -29,9 +29,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: log.c,v 1.4 2016/06/08 01:11:49 christos Exp $");
+__RCSID("$NetBSD: log.c,v 1.5 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include <err.h>
Index: src/usr.sbin/mopd/mopcopy/mopcopy.c
diff -u src/usr.sbin/mopd/mopcopy/mopcopy.c:1.13 src/usr.sbin/mopd/mopcopy/mopcopy.c:1.14
--- src/usr.sbin/mopd/mopcopy/mopcopy.c:1.13 Wed Oct 23 00:45:58 2024
+++ src/usr.sbin/mopd/mopcopy/mopcopy.c Tue Dec 3 05:57:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mopcopy.c,v 1.13 2024/10/23 00:45:58 kalvisd Exp $ */
+/* $NetBSD: mopcopy.c,v 1.14 2024/12/03 05:57:02 kalvisd Exp $ */
/* mopcopy - Convert a Unix format kernel into something that
* can be transferred via MOP.
@@ -47,9 +47,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "port.h"
+#if defined (HAVE_NBTOOL_CONFIG_H)
+# include "nbtool_config.h"
+#else
+# include "port.h"
+#endif /* defined (HAVE_NBTOOL_CONFIG_H) */
#ifndef lint
-__RCSID("$NetBSD: mopcopy.c,v 1.13 2024/10/23 00:45:58 kalvisd Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.14 2024/12/03 05:57:02 kalvisd Exp $");
#endif
#include "os.h"
