aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-12 11:22:24 +0100
committermarha <marha@users.sourceforge.net>2013-11-12 11:22:24 +0100
commitf1b679a372274041aa3e7a02f979390b17eb1ab5 (patch)
treef5bad38b25c1e5bf69cb06b4236cccb4310f769f /fontconfig/src
parent3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff)
parentb73c544c61712f7bd57f3c9a0f6046481f58038b (diff)
downloadvcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz
vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2
vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip
Merge remote-tracking branch 'origin/released'
* origin/released: pixman mesa fontconfig git update 12 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'fontconfig/src')
-rw-r--r--fontconfig/src/fcxml.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index da9cb5ddc..ec79b8723 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -610,11 +610,11 @@ FcTypecheckValue (FcConfigParse *parse, FcType value, FcType type)
if ((value == FcTypeLangSet && type == FcTypeString) ||
(value == FcTypeString && type == FcTypeLangSet))
return;
- if (type == (FcType) -1)
+ if (type == FcTypeUnknown)
return;
/* It's perfectly fine to use user-define elements in expressions,
* so don't warn in that case. */
- if (value == (FcType) -1)
+ if (value == FcTypeUnknown)
return;
FcConfigMessage (parse, FcSevereWarning, "saw %s, expected %s",
FcTypeName (value), FcTypeName (type));