diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /fontconfig | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/config.h | 3 | ||||
| -rw-r--r-- | fontconfig/configure.ac | 2 | ||||
| -rw-r--r-- | fontconfig/src/fcint.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/fontconfig/config.h b/fontconfig/config.h index 0769033b3..e9ebf015e 100644 --- a/fontconfig/config.h +++ b/fontconfig/config.h @@ -3,4 +3,5 @@ #define ENABLE_LIBXML2 #define HAVE_RAND 1 #define HAVE_STRUCT_DIRENT_D_TYPE 1 -#undef __STDC__
\ No newline at end of file +#undef __STDC__ +#define FLEXIBLE_ARRAY_MEMBER
\ No newline at end of file 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 { |