diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
| commit | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (patch) | |
| tree | 2a8a059fc83d3f7acc1034071ed3a9f7ff3c0027 /fontconfig/src/fcname.c | |
| parent | 0ae7710db53515dab4a35c33ba9a030bbfc2ac5b (diff) | |
| download | vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.gz vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.bz2 vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.zip | |
fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012
Diffstat (limited to 'fontconfig/src/fcname.c')
| -rw-r--r-- | fontconfig/src/fcname.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fontconfig/src/fcname.c b/fontconfig/src/fcname.c index d77eff6f7..1b32b0ff6 100644 --- a/fontconfig/src/fcname.c +++ b/fontconfig/src/fcname.c @@ -296,8 +296,6 @@ FcObjectValidType (FcObject object, FcType type) if (t) { switch (t->type) { - case -1: - return FcTrue; case FcTypeDouble: case FcTypeInteger: if (type == FcTypeDouble || type == FcTypeInteger) @@ -308,7 +306,7 @@ FcObjectValidType (FcObject object, FcType type) return FcTrue; break; default: - if (type == t->type) + if (t->type == -1 || type == t->type) return FcTrue; break; } @@ -511,7 +509,7 @@ FcNameUnregisterConstants (const FcConstant *consts, int nconsts) } const FcConstant * -FcNameGetConstant (FcChar8 *string) +FcNameGetConstant (const FcChar8 *string) { const FcConstantList *l; int i; @@ -526,7 +524,7 @@ FcNameGetConstant (FcChar8 *string) } FcBool -FcNameConstant (FcChar8 *string, int *result) +FcNameConstant (const FcChar8 *string, int *result) { const FcConstant *c; |