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...

[Ben Laurie]

On 19/06/2011 03:47, TAKAHASHI Yoshihiro wrote:
> In article <201106181356.p5IDuXhW044171 at svn.freebsd.org>
> Ben Laurie <benl at freebsd.org> 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 <sys/ioccom.h>
>>  
>>  #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 <nyan at FreeBSD.org>
> 
> 


-- 
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