[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Behdad Esfahbod]

On 01/01/11 10:35, Jon TURNEY wrote:

>> +FC_ASSERT_STATIC (0x08 + 1*SIZEOF_VOID_P == sizeof (FcValue));
> 
> This compile-time assert fails on cygwin, see [1].
> 
> /opt/jhbuild/git/fontconfig/src/fcarch.c:58: error: size of array
> '_static_assert_on_line_58_failed' is negative
> make[3]: *** [fcarch.o] Error 1
> 
> cygwin is le32d8, and it looks to me like that assert isn't going to be
> correct for 8-byte aligned doubles.
> 
> I'm not sure what the invariant should be, would the following be better?
> 
> -FC_ASSERT_STATIC (0x08 + 1*SIZEOF_VOID_P == sizeof (FcValue));
> +FC_ASSERT_STATIC (ALIGNOF_DOUBLE + sizeof(double) == sizeof (FcValue));

Fixed.  Thanks.

behdad