diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
| commit | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (patch) | |
| tree | 24d79f7eaee4d69dde46cf88aa7314a4fceebbe5 /fontconfig/fontconfig | |
| parent | 2fe2056807d1304de86deb2b59992d51d9252ad0 (diff) | |
| download | vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.gz vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.bz2 vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.zip | |
fontconfig mesa git update 28 June 2013
fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad
mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379
Diffstat (limited to 'fontconfig/fontconfig')
| -rw-r--r-- | fontconfig/fontconfig/fcprivate.h | 3 | ||||
| -rw-r--r-- | fontconfig/fontconfig/fontconfig.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fontconfig/fontconfig/fcprivate.h b/fontconfig/fontconfig/fcprivate.h index 18b8c08ca..210c1d8a3 100644 --- a/fontconfig/fontconfig/fcprivate.h +++ b/fontconfig/fontconfig/fcprivate.h @@ -48,8 +48,9 @@ __o__ = va_arg (va, const char *); \ if (!__o__) \ break; \ - __v__.type = va_arg (va, FcType); \ + __v__.type = va_arg (va, int); \ switch (__v__.type) { \ + case FcTypeUnknown: \ case FcTypeVoid: \ goto _FcPatternVapBuild_bail1; \ case FcTypeInteger: \ diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 422187b3c..39d1b1b9c 100644 --- a/fontconfig/fontconfig/fontconfig.h +++ b/fontconfig/fontconfig/fontconfig.h @@ -185,6 +185,7 @@ typedef int FcBool; #define FC_LCD_LEGACY 3 typedef enum _FcType { + FcTypeUnknown = -1, FcTypeVoid, FcTypeInteger, FcTypeDouble, |