From owner-svn-src-all@FreeBSD.ORG Sun Jun 19 12:12:17 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13BC4106564A; Sun, 19 Jun 2011 12:12:17 +0000 (UTC) (envelope-from ben@links.org) Received: from mail.links.org (mail.links.org [217.155.92.109]) by mx1.freebsd.org (Postfix) with ESMTP id AF6F38FC0C; Sun, 19 Jun 2011 12:12:16 +0000 (UTC) Received: from [193.133.15.218] (localhost [127.0.0.1]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.links.org (Postfix) with ESMTPS id 644FF33C1F; Sun, 19 Jun 2011 13:12:15 +0100 (BST) Message-ID: <4DFDE79F.6030803@links.org> Date: Sun, 19 Jun 2011 13:12:15 +0100 From: Ben Laurie User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.17) Gecko/20110414 Thunderbird/3.1.10 MIME-Version: 1.0 To: TAKAHASHI Yoshihiro References: <201106181356.p5IDuXhW044171@svn.freebsd.org> <20110619.114704.59640143160110864.nyan@FreeBSD.org> In-Reply-To: <20110619.114704.59640143160110864.nyan@FreeBSD.org> X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: benl@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r223262 - in head: cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/bfd contrib/binutils/gas contrib/binutils/gas/config contrib/binutils/ld contrib/binutils/opcodes contr... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 12:12:17 -0000 On 19/06/2011 03:47, TAKAHASHI Yoshihiro wrote: > In article <201106181356.p5IDuXhW044171@svn.freebsd.org> > Ben Laurie writes: > >> Author: benl >> Date: Sat Jun 18 13:56:33 2011 >> New Revision: 223262 >> URL: http://svn.freebsd.org/changeset/base/223262 >> >> Log: >> Fix clang warnings. >> >> Modified: head/sys/sys/diskpc98.h >> ============================================================================== >> --- head/sys/sys/diskpc98.h Sat Jun 18 13:54:36 2011 (r223261) >> +++ head/sys/sys/diskpc98.h Sat Jun 18 13:56:33 2011 (r223262) >> @@ -36,8 +36,11 @@ >> #include >> >> #define DOSBBSECTOR 0 /* DOS boot block relative sector number */ >> +#undef DOSPARTOFF >> #define DOSPARTOFF 0 >> +#undef DOSPARTSIZE >> #define DOSPARTSIZE 32 >> +#undef NDOSPART >> #define NDOSPART 16 >> #define DOSMAGICOFFSET 510 >> #define DOSMAGIC 0xAA55 >> @@ -52,6 +55,7 @@ >> >> #define DOSMID_386BSD (PC98_MID_386BSD | PC98_MID_BOOTABLE) >> #define DOSSID_386BSD (PC98_SID_386BSD | PC98_SID_ACTIVE) >> +#undef DOSPTYP_386BSD >> #define DOSPTYP_386BSD (DOSSID_386BSD << 8 | DOSMID_386BSD) >> >> struct pc98_partition { >> > > I wonder why this is needed, and why only for diskpc98.h, not > diskmbr.h. It is needed because it is defined elsewhere, of course. I don't know why it isn't needed for diskmbr.h - perhaps that's the elsewhere? > > --- > TAKAHASHI Yoshihiro > > -- http://www.apache-ssl.org/ben.html http://www.links.org/ "There is no limit to what a man can do or how far he can go if he doesn't mind who gets the credit." - Robert Woodruff