From owner-svn-src-stable@FreeBSD.ORG  Sun Mar 22 10:51:41 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 44548106567A;
	Sun, 22 Mar 2009 10:51:41 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 31A818FC1C;
	Sun, 22 Mar 2009 10:51:41 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2MApeLT066683;
	Sun, 22 Mar 2009 10:51:40 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2MApeGb066682;
	Sun, 22 Mar 2009 10:51:40 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200903221051.n2MApeGb066682@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Sun, 22 Mar 2009 10:51:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190259 - stable/7/sbin/fdisk_pc98
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2009 10:51:42 -0000

Author: nyan
Date: Sun Mar 22 10:51:40 2009
New Revision: 190259
URL: http://svn.freebsd.org/changeset/base/190259

Log:
  MFC: r190027
  
    Use the common PC98_SID_ACTIVE define instead of a local define.

Modified:
  stable/7/sbin/fdisk_pc98/   (props changed)
  stable/7/sbin/fdisk_pc98/fdisk.c

Modified: stable/7/sbin/fdisk_pc98/fdisk.c
==============================================================================
--- stable/7/sbin/fdisk_pc98/fdisk.c	Sun Mar 22 10:42:07 2009	(r190258)
+++ stable/7/sbin/fdisk_pc98/fdisk.c	Sun Mar 22 10:51:40 2009	(r190259)
@@ -84,8 +84,6 @@ struct mboot {
 static struct mboot mboot;
 static int fd;
 
-#define ACTIVE 0x80
-
 static uint dos_cyls;
 static uint dos_heads;
 static uint dos_sectors;
@@ -520,7 +518,7 @@ change_active(int which)
 
 	active = -1;
 	for (i = 0; i < NDOSPART; i++) {
-		if ((partp[i].dp_sid & ACTIVE) == 0)
+		if ((partp[i].dp_sid & PC98_SID_ACTIVE) == 0)
 			continue;
 		printf("Partition %d is marked active\n", i + 1);
 		if (active == -1)
@@ -545,7 +543,7 @@ setactive:
 		active = new;
 	} while (!ok("Are you happy with this choice"));
 	if (active > 0 && active <= 8)
-		partp[active-1].dp_sid |= ACTIVE;
+		partp[active-1].dp_sid |= PC98_SID_ACTIVE;
 }
 
 static void