[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcarch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3bb3f19c917e3fd0a0cdd9a2adf8f827e7a5838
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Aug 21 14:31:55 2013 -0400

    Fix assertion
    
    Apparently some AIX versions have 64bit pointers yet 32bit double
    alignment.  Fix assertion.

diff --git a/src/fcarch.c b/src/fcarch.c
index 35734c0..21516ff 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -49,7 +49,7 @@ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
 FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
 FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
 
-FC_ASSERT_STATIC (0x08 + 1*FC_MAX(4,ALIGNOF_DOUBLE) == sizeof (FcValue));
+FC_ASSERT_STATIC (0x08 + 1*FC_MAX(SIZEOF_VOID_P,ALIGNOF_DOUBLE) == sizeof (FcValue));
 FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
 FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));
 FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcCharSet));