Module Name: src
Committed By: matt
Date: Fri May 3 21:32:05 UTC 2013
Modified Files:
src/usr.sbin/installboot/arch: hp300.c vax.c
Log Message:
Make this build with the disk label change.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/installboot/arch/hp300.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/installboot/arch/vax.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/installboot/arch/hp300.c
diff -u src/usr.sbin/installboot/arch/hp300.c:1.13 src/usr.sbin/installboot/arch/hp300.c:1.14
--- src/usr.sbin/installboot/arch/hp300.c:1.13 Thu Feb 10 23:25:11 2011
+++ src/usr.sbin/installboot/arch/hp300.c Fri May 3 21:32:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $ */
+/* $NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,12 +35,13 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: hp300.c,v 1.13 2011/02/10 23:25:11 tsutsui Exp $");
+__RCSID("$NetBSD: hp300.c,v 1.14 2013/05/03 21:32:04 matt Exp $");
#endif /* !__lint */
/* We need the target disklabel.h, not the hosts one..... */
#ifdef HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
+#include <nbinclude/hp300/disklabel.h>
#include <nbinclude/sys/disklabel.h>
#else
#include <sys/disklabel.h>
Index: src/usr.sbin/installboot/arch/vax.c
diff -u src/usr.sbin/installboot/arch/vax.c:1.15 src/usr.sbin/installboot/arch/vax.c:1.16
--- src/usr.sbin/installboot/arch/vax.c:1.15 Thu Apr 4 16:11:12 2013
+++ src/usr.sbin/installboot/arch/vax.c Fri May 3 21:32:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vax.c,v 1.15 2013/04/04 16:11:12 martin Exp $ */
+/* $NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -68,11 +68,16 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: vax.c,v 1.15 2013/04/04 16:11:12 martin Exp $");
+__RCSID("$NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $");
#endif /* !__lint */
#include <sys/param.h>
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/vax/disklabel.h>
+#include <nbinclude/sys/disklabel.h>
+#else
#include <sys/disklabel.h>
+#endif
#include <assert.h>
#include <err.h>
