Module Name: src
Committed By: joerg
Date: Thu Oct 2 19:15:21 UTC 2014
Modified Files:
src/sbin/gpt: biosboot.c gpt.c
Log Message:
Fix tools build on !NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/gpt/biosboot.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/biosboot.c
diff -u src/sbin/gpt/biosboot.c:1.12 src/sbin/gpt/biosboot.c:1.13
--- src/sbin/gpt/biosboot.c:1.12 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/biosboot.c Thu Oct 2 19:15:21 2014
@@ -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>
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.34 src/sbin/gpt/gpt.c:1.35
--- src/sbin/gpt/gpt.c:1.34 Tue Sep 30 17:59:59 2014
+++ src/sbin/gpt/gpt.c Thu Oct 2 19:15:21 2014
@@ -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 @@ __RCSID("$NetBSD: gpt.c,v 1.34 2014/09/3
#ifndef HAVE_NBTOOL_CONFIG_H
#include <prop/proplib.h>
#include <sys/drvctlio.h>
+#include <sys/disk.h>
#endif
#include "map.h"
