[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Akira TAGOH]

 src/fclist.c |    2 +-
 src/fcxml.c  |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 45018e6979198b92b732b4b5e29671b2fe499bd8
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 24 15:25:16 2015 +0900

    Fix pointer cast warning on win32

diff --git a/src/fclist.c b/src/fclist.c
index 6ad297c..d7e8fc0 100644
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -270,7 +270,7 @@ FcListValueHash (FcValue    *value)
     case FcTypeCharSet:
 	return FcCharSetCount (v.u.c);
     case FcTypeFTFace:
-	return (long) v.u.f;
+	return (intptr_t) v.u.f;
     case FcTypeLangSet:
 	return FcLangSetHash (v.u.l);
     case FcTypeRange:
commit f43c58189bb667e65630c37f33a58d39d7c550f6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 24 15:01:14 2015 +0900

    ifdef'd the unnecessary code for win32

diff --git a/src/fcxml.c b/src/fcxml.c
index 29dd4d6..cdb14b6 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2249,7 +2249,9 @@ FcParseInclude (FcConfigParse *parse)
     FcChar8	    *s;
     const FcChar8   *attr;
     FcBool	    ignore_missing = FcFalse;
+#ifndef _WIN32
     FcBool	    deprecated = FcFalse;
+#endif
     FcChar8	    *prefix = NULL, *p;
     static FcChar8  *userdir = NULL;
     static FcChar8  *userconf = NULL;
@@ -2263,9 +2265,11 @@ FcParseInclude (FcConfigParse *parse)
     attr = FcConfigGetAttribute (parse, "ignore_missing");
     if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue)
 	ignore_missing = FcTrue;
+#ifndef _WIN32
     attr = FcConfigGetAttribute (parse, "deprecated");
     if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue)
         deprecated = FcTrue;
+#endif
     attr = FcConfigGetAttribute (parse, "prefix");
     if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
     {