Date: Sat, 29 Mar 2014 22:02:25 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263923 - head/usr.bin/mkimg Message-ID: <201403292202.s2TM2PGx006263@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sat Mar 29 22:02:25 2014 New Revision: 263923 URL: http://svnweb.freebsd.org/changeset/base/263923 Log: Fix build on FreeBSD 9 where <sys/pc98.h> has the same defines as <sys/diskmbr.h> and not the unique defines introduced later. Modified: head/usr.bin/mkimg/pc98.c Modified: head/usr.bin/mkimg/pc98.c ============================================================================== --- head/usr.bin/mkimg/pc98.c Sat Mar 29 21:26:45 2014 (r263922) +++ head/usr.bin/mkimg/pc98.c Sat Mar 29 22:02:25 2014 (r263923) @@ -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[] = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403292202.s2TM2PGx006263>