diff options
author | marha <marha@users.sourceforge.net> | 2013-02-07 10:17:56 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-07 10:17:56 +0100 |
commit | 956c20498738c242726b5a42ed28db8572a90bed (patch) | |
tree | bf663b89417d0d9d7b37575eb0260d5a10af0e12 /fontconfig/src/fcint.h | |
parent | 76c527be60066b647468ad66f8e4d7dd18fa1769 (diff) | |
download | vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.gz vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.tar.bz2 vcxsrv-956c20498738c242726b5a42ed28db8572a90bed.zip |
mesa fontconfig git update 7 Feb 2013
fontconfig commit 96220a5ed9d1d761b14a7ac516ac6786c132f280
mesa commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
Diffstat (limited to 'fontconfig/src/fcint.h')
-rw-r--r-- | fontconfig/src/fcint.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index b5ff382f5..4eac6105a 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -425,7 +425,7 @@ typedef struct _FcCaseFold { #define FC_CACHE_MAGIC_MMAP 0xFC02FC04 #define FC_CACHE_MAGIC_ALLOC 0xFC02FC05 -#define FC_CACHE_CONTENT_VERSION 3 +#define FC_CACHE_CONTENT_VERSION 4 struct _FcAtomic { FcChar8 *file; /* original file name */ @@ -858,7 +858,7 @@ FcListPatternMatchAny (const FcPattern *p, enum { FC_INVALID_OBJECT = 0, -#define FC_OBJECT(NAME, Type) FC_##NAME##_OBJECT, +#define FC_OBJECT(NAME, Type, Cmp) FC_##NAME##_OBJECT, #include "fcobjs.h" #undef FC_OBJECT FC_ONE_AFTER_MAX_BASE_OBJECT |