fontconfig: Branch 'master'

 src/fcxml.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5b6af242e1eb0a6456fe9ab9a99efa3ba42f83c6
Author: Akira TAGOH <[email protected]>
Date:   Tue Jul 11 15:34:50 2017 +0900

    Fix gcc warnings with enabling libxml2

diff --git a/src/fcxml.c b/src/fcxml.c
index a7a41ce..3c18ced 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3234,11 +3234,11 @@ FcConfigParseAndLoadFromMemoryInternal (FcConfig       *config,
     size_t	    len;
     FcConfigParse   parse;
     FcBool	    error = FcTrue;
-    void            *buf;
 
 #ifdef ENABLE_LIBXML2
     xmlSAXHandler   sax;
 #else
+    void            *buf;
     const FcChar8   *s;
     size_t	    buflen;
 #endif
@@ -3303,7 +3303,7 @@ FcConfigParseAndLoadFromMemoryInternal (FcConfig       *config,
 #endif
 
 #ifdef ENABLE_LIBXML2
-	if (xmlParseChunk (p, buffer, len, len == 0))
+	if (xmlParseChunk (p, (const char *)buffer, len, len == 0))
 #else
 	if (!XML_ParseBuffer (p, buflen, buflen == 0))
 #endif
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig