Add FcPatternHash, clean up a few valgrind issues

[fontconfig.git] / src / fcxml.c

diff --git a/src/fcxml.c b/src/fcxml.c
index 09aa79ebaaed79f86984720bafdbe3a2858e5fa3..ef116d05aa08d4c749734defee29094f75c3a525 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -25,7 +25,18 @@
 #include <stdarg.h>
 #include "fcint.h"
 
+#ifndef HAVE_EXPAT
+#define HAVE_EXPAT 1
+#endif
+
+#ifndef HAVE_XML2
+#define HAVE_XML2 0
+#endif
+
 #if HAVE_EXPAT
+#ifndef HAVE_XMLPARSE_H
+#define HAVE_XMLPARSE_H 0
+#endif
 #if HAVE_XMLPARSE_H
 #include <xmlparse.h>
 #else
@@ -1135,7 +1146,7 @@ FcParseAlias (FcConfigParse *parse)
     if (edit)
     {
        test = FcTestCreate (FcQualAny,
-                            FcStrCopy ((FcChar8 *) "family"),
+                            FC_FAMILY,
                             FcOpEqual,
                             family);
        if (test)