[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcarch.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5ac12c0e94128ea63e3e74b4e602cf0c74661bce
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu May 10 16:47:09 2012 +0900

    fcarch.c: get rid of the duplicate definition of FC_MAX
    
    FC_MAX is also available in src/fcint.h

diff --git a/src/fcarch.c b/src/fcarch.c
index 5fe7d97..44548fc 100644
--- a/src/fcarch.c
+++ b/src/fcarch.c
@@ -56,8 +56,6 @@ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
 FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
 FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
 
-#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));