[src/trunk]: src/sbin/gpt Fix tools build on !NetBSD.

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

details:   https://anonhg.NetBSD.org/src/rev/91640e724241
branches:  trunk
changeset: 332664:91640e724241
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Oct 02 19:15:21 2014 +0000

description:
Fix tools build on !NetBSD.

diffstat:

 sbin/gpt/biosboot.c |  6 ++++--
 sbin/gpt/gpt.c      |  4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r a0934307d3dd -r 91640e724241 sbin/gpt/biosboot.c
--- a/sbin/gpt/biosboot.c       Thu Oct 02 18:16:13 2014 +0000
+++ b/sbin/gpt/biosboot.c       Thu Oct 02 19:15:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: biosboot.c,v 1.12 2014/09/30 17:59:59 christos Exp $ */
+/*     $NetBSD: biosboot.c,v 1.13 2014/10/02 19:15:21 joerg Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -37,13 +37,15 @@
 
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: biosboot.c,v 1.12 2014/09/30 17:59:59 christos Exp $");
+__RCSID("$NetBSD: biosboot.c,v 1.13 2014/10/02 19:15:21 joerg Exp $");
 #endif
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#ifndef HAVE_NBTOOL_CONFIG_H
 #include <sys/disk.h>
+#endif
 #include <sys/param.h>
 #include <sys/bootblock.h>
 
diff -r a0934307d3dd -r 91640e724241 sbin/gpt/gpt.c
--- a/sbin/gpt/gpt.c    Thu Oct 02 18:16:13 2014 +0000
+++ b/sbin/gpt/gpt.c    Thu Oct 02 19:15:21 2014 +0000
@@ -35,12 +35,11 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.34 2014/09/30 17:59:59 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.35 2014/10/02 19:15:21 joerg Exp $");
 #endif
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/disk.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/bootblock.h>
@@ -58,6 +57,7 @@
 #ifndef HAVE_NBTOOL_CONFIG_H
 #include <prop/proplib.h>
 #include <sys/drvctlio.h>
+#include <sys/disk.h>
 #endif
 
 #include "map.h"