diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
| commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
| tree | c9891fdc315c41cc90806634589231172572b2ba /fontconfig/src/fcint.h | |
| parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'fontconfig/src/fcint.h')
| -rw-r--r-- | fontconfig/src/fcint.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index 65bf3330b..0137deeb4 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -107,7 +107,9 @@ extern pfnSHGetFolderPathA pSHGetFolderPathA; FC_ASSERT_STATIC (sizeof (FcRef) == sizeof (int)); typedef enum _FcValueBinding { - FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame + FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame, + /* to make sure sizeof (FcValueBinding) == 4 even with -fshort-enums */ + FcValueBindingEnd = 0xffffffff } FcValueBinding; #define FcStrdup(s) ((FcChar8 *) strdup ((const char *) (s))) @@ -623,7 +625,7 @@ FcConfigSetFonts (FcConfig *config, FcPrivate FcBool FcConfigCompareValue (const FcValue *m, - FcOp op, + unsigned int op_, const FcValue *v); FcPrivate FcBool |