Module Name: src
Committed By: msaitoh
Date: Mon Jun 17 02:05:19 UTC 2013
Modified Files:
src/usr.sbin/installboot/arch [netbsd-6]: vax.c
Log Message:
Fix compile error (requested by martin in ticket #865):
usr.sbin/installboot/arch/vax.c rev. 1.16-1.17
Don't include host's disklabel.h.
To generate a diff of this commit:
cvs rdiff -u -r1.13.8.1 -r1.13.8.2 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/vax.c
diff -u src/usr.sbin/installboot/arch/vax.c:1.13.8.1 src/usr.sbin/installboot/arch/vax.c:1.13.8.2
--- src/usr.sbin/installboot/arch/vax.c:1.13.8.1 Sat Apr 20 09:58:23 2013
+++ src/usr.sbin/installboot/arch/vax.c Mon Jun 17 02:05:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vax.c,v 1.13.8.1 2013/04/20 09:58:23 bouyer Exp $ */
+/* $NetBSD: vax.c,v 1.13.8.2 2013/06/17 02:05:19 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -68,11 +68,15 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: vax.c,v 1.13.8.1 2013/04/20 09:58:23 bouyer Exp $");
+__RCSID("$NetBSD: vax.c,v 1.13.8.2 2013/06/17 02:05:19 msaitoh Exp $");
#endif /* !__lint */
#include <sys/param.h>
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/vax/disklabel.h>
+#else
#include <sys/disklabel.h>
+#endif
#include <assert.h>
#include <err.h>
