diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-30 11:11:16 +0200 |
| commit | 0f0386d4e90cb0769eddc04b18742d5a9a72ea05 (patch) | |
| tree | a8a5fb11e78c4afe6637c5adfa0d2224208f7314 /fontconfig/src/fcint.h | |
| parent | cd27f58626705bcb561115b8e5b0d1430df83fa6 (diff) | |
| parent | 762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff) | |
| download | vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.gz vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.tar.bz2 vcxsrv-0f0386d4e90cb0769eddc04b18742d5a9a72ea05.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
Diffstat (limited to 'fontconfig/src/fcint.h')
| -rw-r--r-- | fontconfig/src/fcint.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index e45df5351..0a59f70ac 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -860,7 +860,8 @@ FcListPatternMatchAny (const FcPattern *p, #define FC_EMBEDDED_BITMAP_OBJECT 39 #define FC_DECORATIVE_OBJECT 40 #define FC_LCD_FILTER_OBJECT 41 -#define FC_MAX_BASE_OBJECT FC_LCD_FILTER_OBJECT +#define FC_NAMELANG_OBJECT 42 +#define FC_MAX_BASE_OBJECT FC_NAMELANG_OBJECT FcPrivate FcBool FcNameBool (const FcChar8 *v, FcBool *result); |