From f443f7d2a6cc45c88da835efc503a63f57c60913 Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Sat, 29 Mar 2014 22:02:25 +0000
Subject: Fix build on FreeBSD 9 where <sys/pc98.h> has the same defines as
 <sys/diskmbr.h> and not the unique defines introduced later.

---
 usr.bin/mkimg/pc98.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'usr.bin')

diff --git a/usr.bin/mkimg/pc98.c b/usr.bin/mkimg/pc98.c
index 12311d9..bce6c3c 100644
--- a/usr.bin/mkimg/pc98.c
+++ b/usr.bin/mkimg/pc98.c
@@ -38,6 +38,19 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef PC98_MAGIC
+#define	PC98_MAGIC		0xaa55
+#endif
+#ifndef PC98_MAGICOFS
+#define	PC98_MAGICOFS		510
+#endif
+#ifndef PC98_NPARTS
+#define	PC98_NPARTS		16
+#endif
+#ifndef PC98_PTYP_386BSD
+#define	PC98_PTYP_386BSD	0xc494
+#endif
+
 #define	PC98_BOOTCODESZ		8192
 
 static struct mkimg_alias pc98_aliases[] = {
-- 
cgit v1.1