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

[Akira TAGOH]

 configure.in |    1 -
 src/fcarch.c |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d81407611b160ebfa631556ee60be147d1c0416f
Author: Keith Packard <keithp at keithp.com>
Date:   Tue May 1 19:28:27 2012 -0700

    Deal with architectures where ALIGNOF_DOUBLE < 4
    
    This patch isn't really tested as I don't have such a machine, but I
    have a bug report that on m68k machines, double values are aligned on
    smaller than 4 byte boundaries. If ALIGNOF_DOUBLE < sizeof(int),
    the "expected" sizeof of FcValue is miscomputed. Use the maximum of 4
    (sizeof (int)) and ALIGNOF_DOUBLE when computing the expected size of
    FcValue.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/src/fcarch.c b/src/fcarch.c
index 09d24b3..5fe7d97 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -56,7 +56,9 @@ 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*ALIGNOF_DOUBLE == sizeof (FcValue));
+#define FC_MAX(a,b)	((a) > (b) ? (a) : (b))
+
+FC_ASSERT_STATIC (0x08 + 1*FC_MAX(4,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));
commit e41474e925947b5a2fb64c80135bc116e9e56d2d
Author: Keith Packard <keithp at keithp.com>
Date:   Tue May 1 19:28:26 2012 -0700

    Extra ',' in AC_ARG_WITH(arch causes arch to never be autodetected
    
    Commit 87d7b82a98780223422a829b6bb1a05fd753ae5e reformatted this
    part of the configure script, accidentally introducing a spurious
    comma.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.in b/configure.in
index b77c52a..b2174d9 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,6 @@ dnl ==========================================================================
 AC_ARG_WITH(arch,
 	[AC_HELP_STRING([--with-arch=ARCH],
 			[Force architecture to ARCH])],
-	,
 	arch="$withval", arch=auto)
 
 if test "x$arch" != xauto; then