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/config.h | |
| 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/config.h')
| -rw-r--r-- | fontconfig/config.h | 3 |
1 files changed, 2 insertions, 1 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 |