Date: Fri, 9 Aug 2013 19:20:46 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r254156 - user/marcel/mkimg Message-ID: <201308091920.r79JKkNg083958@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Fri Aug 9 19:20:46 2013 New Revision: 254156 URL: http://svnweb.freebsd.org/changeset/base/254156 Log: Now that we can include <sys/diskpc98.h> and <sys/diskmbr.h> at the same time withiut conflict, use the constants defined in them. Modified: user/marcel/mkimg/scheme.c Modified: user/marcel/mkimg/scheme.c ============================================================================== --- user/marcel/mkimg/scheme.c Fri Aug 9 19:10:56 2013 (r254155) +++ user/marcel/mkimg/scheme.c Fri Aug 9 19:20:46 2013 (r254156) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/diskmbr.h> +#include <sys/diskpc98.h> #include <sys/vtoc.h> #include <err.h> #include <errno.h> @@ -125,10 +126,10 @@ scheme_max_parts(void) parts = 4096; break; case SCHEME_MBR: - parts = 4; + parts = NDOSPART; break; case SCHEME_PC98: - parts = 16; + parts = PC98_NPARTS; break; case SCHEME_VTOC8: parts = VTOC8_NPARTS;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308091920.r79JKkNg083958>