[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 0c7b8676171f2238af9785abf775e0f420e6545a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Jan 2 13:25:29 2011 -0700

    Fix assertion failure on le32d4
    
    Reported by Jon TURNEY.

diff --git a/src/fcarch.c b/src/fcarch.c
index 36d0ce5..c69397e 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2002 Keith Packard
+ * Copyright © 2010 Behdad Esfahbod
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -55,7 +56,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*SIZEOF_VOID_P == sizeof (FcValue));
+FC_ASSERT_STATIC (0x08 + 1*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));