address@hidden: Bug#195234: grub: FTBFS with gcc-3.3]

[Jason Thomas]

oukji, is this the correct fix?

----- Forwarded message from Kevin Kreamer <address@hidden> -----

> Date: Sun, 01 Jun 2003 23:29:43 -0500
> From: Kevin Kreamer <address@hidden>
> To: address@hidden
> Cc: address@hidden
> Subject: Bug#195234: grub: FTBFS with gcc-3.3
> 
> 
> tags 195234 patch
> thanks
> 
> Apparently, gcc 3.3 changed whether it is permissible to add long,
> short, signed, or unsigned to a typedef'd declaration.  In this
> particular case, the building failed on '__u32 long j_mount_id;'
> where __u32 was defined as:
> 
> typedef unsigned int __u32;
> 
> earlier in that file.  I don't know enough about the C standard to
> know whether it is correct behaviour to flag this as an error, but in
> any case, the attached patch should allow grub to build from source.
> 
> Thanks,
> Kevin
> 

> diff -r -u grub-0.93+cvs20030224.old/stage2/fsys_reiserfs.c 
> grub-0.93+cvs20030224/stage2/fsys_reiserfs.c
> --- grub-0.93+cvs20030224.old/stage2/fsys_reiserfs.c  2002-11-29 
> 11:56:38.000000000 -0600
> +++ grub-0.93+cvs20030224/stage2/fsys_reiserfs.c      2003-06-01 
> 22:47:12.000000000 -0500
> @@ -37,6 +37,10 @@
>  typedef unsigned int __u32;
>  typedef unsigned long long __u64;
>  
> +/* added to workaround gcc 3.3 no longer liking
> + * '__u32 long' as a type declaration */
> +typedef unsigned int long __u32_long;
> +
>  /* linux/posix_type.h */
>  typedef long linux_off_t;
>  
> @@ -112,7 +116,7 @@
>    /* offset in the log of where to start replay after a crash */
>    __u32 j_first_unflushed_offset;
>    /* mount id to detect very old transactions */
> -  __u32 long j_mount_id;
> +  __u32_long j_mount_id;
>  };
>  
>  /* magic string to find desc blocks in the journal */




----- End forwarded message -----

-- 
Jason Thomas                           Phone:  +61 2 6257 7111
Unix System Administrator              Fax:    +61 2 6257 7311
Intology Services Pty. Ltd.            Mobile: 0418 29 66 81
1 Hall Street Lyneham ACT 2602         http://www.intology.com.au/