[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

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

New commits:
commit d162a4a83d6bf2182e288e0bc0b4d3ae2f78f040
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 16 17:24:22 2015 +0900

    Fix assertion on 32bit arch

diff --git a/src/fcarch.c b/src/fcarch.c
index da33a83..6ca15a9 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -48,7 +48,7 @@ FC_ASSERT_STATIC (0x08 + 1*FC_MAX(SIZEOF_VOID_P,ALIGNOF_DOUBLE) == sizeof (FcVal
 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));
-FC_ASSERT_STATIC (0x08 + 7*SIZEOF_VOID_P == sizeof (FcCache));
+FC_ASSERT_STATIC (0x10 + 6*SIZEOF_VOID_P == sizeof (FcCache));
 
 
 int