From owner-svn-src-user@FreeBSD.ORG  Fri Aug  9 19:20:46 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B093BD93;
 Fri,  9 Aug 2013 19:20:46 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E5AD2C4A;
 Fri,  9 Aug 2013 19:20:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79JKkIV083959;
 Fri, 9 Aug 2013 19:20:46 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79JKkNg083958;
 Fri, 9 Aug 2013 19:20:46 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201308091920.r79JKkNg083958@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 9 Aug 2013 19:20:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r254156 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Aug 2013 19:20:46 -0000

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;