[src/trunk]: src/usr.sbin/installboot/arch Make this build with the disk labe...

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

details:   https://anonhg.NetBSD.org/src/rev/5017b243cb76
branches:  trunk
changeset: 786624:5017b243cb76
user:      matt <matt%NetBSD.org@localhost>
date:      Fri May 03 21:32:04 2013 +0000

description:
Make this build with the disk label change.

diffstat:

 usr.sbin/installboot/arch/hp300.c |  5 +++--
 usr.sbin/installboot/arch/vax.c   |  9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 8b654b5db92e -r 5017b243cb76 usr.sbin/installboot/arch/hp300.c
--- a/usr.sbin/installboot/arch/hp300.c Fri May 03 21:23:36 2013 +0000
+++ b/usr.sbin/installboot/arch/hp300.c Fri May 03 21:32:04 2013 +0000
@@ -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>
diff -r 8b654b5db92e -r 5017b243cb76 usr.sbin/installboot/arch/vax.c
--- a/usr.sbin/installboot/arch/vax.c   Fri May 03 21:23:36 2013 +0000
+++ b/usr.sbin/installboot/arch/vax.c   Fri May 03 21:32:04 2013 +0000
@@ -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>