[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac |    2 ++
 src/fcint.h  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit da9400212db8e5aa0a0bdd4fad21d2008b5034e2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 18 11:23:39 2012 +0900

    Fix a build fail with gcc 2.95, not supporting the flexible array members.

diff --git a/configure.ac b/configure.ac
index 140cb70..12e4d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
+AC_PREREQ(2.61)
 AC_INIT(fonts.dtd)
 
 dnl ==========================================================================
@@ -128,6 +129,7 @@ AC_CHECK_HEADERS([fcntl.h regex.h stdlib.h string.h unistd.h sys/vfs.h sys/statf
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
+AC_C_FLEXIBLE_ARRAY_MEMBER
 AC_TYPE_PID_T
 
 # Checks for library functions.
diff --git a/src/fcint.h b/src/fcint.h
index ca6b4f2..c078575 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -280,7 +280,7 @@ struct _FcExprPage {
   FcExprPage *next_page;
   FcExpr *next;
   FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)];
-  FcExpr end[];
+  FcExpr end[FLEXIBLE_ARRAY_MEMBER];
 };
 
 typedef enum _FcQual {