Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)

[fontconfig.git] / src / fclist.c

diff --git a/src/fclist.c b/src/fclist.c
index 02ef877991f3f1c2718aaa5d5a271b6fab5c1224..357932b4aea6b12f2e5761758668b32718b859f3 100644 (file)
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -67,7 +67,7 @@ FcObjectSetAdd (FcObjectSet *os, const char *object)
     low = 0;
     mid = 0;
     c = 1;
-    object = FcStrStaticName (object);
+    object = (char *)FcStrStaticName ((FcChar8 *)object);
     while (low <= high)
     {
        mid = (low + high) >> 1;