[src/trunk]: src/usr.sbin/installboot/arch Oops, straggler: #include <nbinclu...

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

details:   https://anonhg.NetBSD.org/src/rev/a32cda2623db
branches:  trunk
changeset: 581984:a32cda2623db
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Jun 12 21:38:12 2005 +0000

description:
Oops, straggler: #include <nbinclude/sys/disklabel.h> if we're
building a host-tool.

XXX In hp300_setboot, quiet -Wunitialized: initialize secsize to
XXX HP300_SECTSIZE.  Is this correct?

diffstat:

 usr.sbin/installboot/arch/hp300.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 326a32c91574 -r a32cda2623db usr.sbin/installboot/arch/hp300.c
--- a/usr.sbin/installboot/arch/hp300.c Sun Jun 12 21:10:47 2005 +0000
+++ b/usr.sbin/installboot/arch/hp300.c Sun Jun 12 21:38:12 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300.c,v 1.5 2005/06/12 20:21:20 dyoung Exp $ */
+/* $NetBSD: hp300.c,v 1.6 2005/06/12 21:38:12 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -42,15 +42,13 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: hp300.c,v 1.5 2005/06/12 20:21:20 dyoung Exp $");
+__RCSID("$NetBSD: hp300.c,v 1.6 2005/06/12 21:38:12 dyoung Exp $");
 #endif /* !__lint */
 
 /* We need the target disklabel.h, not the hosts one..... */
 #ifdef HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
-#undef __HAVE_OLD_DISKLABEL    /* host's <machine/types.h> may define this */  
-#include "../../sys/arch/hp300/include/disklabel.h"                            
-#include "../../sys/sys/disklabel.h"                                           
+#include <nbinclude/sys/disklabel.h>
 #else                                                                          
 #include <sys/disklabel.h>
 #endif
@@ -80,7 +78,7 @@
        struct hp300_lifdir *lifdir;
        int             offset;
        int             i;
-       unsigned int    secsize;
+       unsigned int    secsize = HP300_SECTSIZE;
        uint64_t        boot_size, boot_offset;
        char            label_buf[DEV_BSIZE];
        struct disklabel *label = (void *)label_buf;