Sun Jun 16 19:05:00 2013 UTC ()
In the tool build <nbinclude/vax/disklabel.h> is enough.


(martin)
diff -r1.16 -r1.17 src/usr.sbin/installboot/arch/vax.c
cvs diff -r1.16 -r1.17 src/usr.sbin/installboot/arch/vax.c (expand / switch to unified diff)

--- src/usr.sbin/installboot/arch/vax.c 2013/05/03 21:32:04 1.16
+++ src/usr.sbin/installboot/arch/vax.c 2013/06/16 19:05:00 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $ */ 1/* $NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Simon Burge. 8 * by Simon Burge.
9 * 9 *
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Luke Mewburn of Wasabi Systems. 11 * by Luke Mewburn of Wasabi Systems.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -58,33 +58,32 @@ @@ -58,33 +58,32 @@
58 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 58 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
59 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 59 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
60 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 60 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
61 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 61 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
62 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 62 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
63 */ 63 */
64 64
65#if HAVE_NBTOOL_CONFIG_H 65#if HAVE_NBTOOL_CONFIG_H
66#include "nbtool_config.h" 66#include "nbtool_config.h"
67#endif 67#endif
68 68
69#include <sys/cdefs.h> 69#include <sys/cdefs.h>
70#if !defined(__lint) 70#if !defined(__lint)
71__RCSID("$NetBSD: vax.c,v 1.16 2013/05/03 21:32:04 matt Exp $"); 71__RCSID("$NetBSD: vax.c,v 1.17 2013/06/16 19:05:00 martin Exp $");
72#endif /* !__lint */ 72#endif /* !__lint */
73 73
74#include <sys/param.h> 74#include <sys/param.h>
75#ifdef HAVE_NBTOOL_CONFIG_H 75#ifdef HAVE_NBTOOL_CONFIG_H
76#include <nbinclude/vax/disklabel.h> 76#include <nbinclude/vax/disklabel.h>
77#include <nbinclude/sys/disklabel.h> 
78#else 77#else
79#include <sys/disklabel.h> 78#include <sys/disklabel.h>
80#endif 79#endif
81 80
82#include <assert.h> 81#include <assert.h>
83#include <err.h> 82#include <err.h>
84#include <stddef.h> 83#include <stddef.h>
85#include <stdio.h> 84#include <stdio.h>
86#include <stdlib.h> 85#include <stdlib.h>
87#include <string.h> 86#include <string.h>
88#include <unistd.h> 87#include <unistd.h>
89 88
90#include "installboot.h" 89#include "installboot.h"