diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-10 14:56:29 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-10 14:56:29 +0200 |
| commit | d137057fd13e83ec15ab416c7fe774741da06047 (patch) | |
| tree | f4b38caa4f3ecb983f00e84f4f4d8d66699ecbc5 /fontconfig | |
| parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
| download | vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.tar.gz vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.tar.bz2 vcxsrv-d137057fd13e83ec15ab416c7fe774741da06047.zip | |
fontconfig mesa xserver git update 10 Jul 2012
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/configure.ac | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcint.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 140cb70aa..12e4d5a6c 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/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/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index ca6b4f209..c07857502 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/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 { |