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

[fontconfig.git] / src / fcdir.c

diff --git a/src/fcdir.c b/src/fcdir.c
index 4ee84def97190cddd50c9ad34ceedb0f6661cd00..c494913a05d144230e9e24488924cce9b9311fc0 100644 (file)
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -136,7 +136,7 @@ FcDirScanConfig (FcFontSet  *set,
        /*
         * Check ~/.fonts.cache-<version> file
         */
-       if (cache && FcGlobalCacheReadDir (set, dirs, cache, dir, config))
+       if (cache && FcGlobalCacheReadDir (set, dirs, cache, (char *)dir, config))
            return FcTrue;
     }
     
@@ -184,7 +184,7 @@ FcDirScanConfig (FcFontSet  *set,
      * add the cache entry 
      */
     if (ret && cache)
-       FcGlobalCacheUpdate (cache, dir, tmpSet);
+       FcGlobalCacheUpdate (cache, (char *)dir, tmpSet);
 
     for (i = 0; i < tmpSet->nfont; i++)
        FcFontSetAdd (set, tmpSet->fonts[i]);
@@ -212,7 +212,7 @@ FcDirScan (FcFontSet            *set,
 }
 
 FcBool
-FcDirSave (FcFontSet *set, const FcChar8 *dir)
+FcDirSave (FcFontSet *set, FcStrSet * dirs, const FcChar8 *dir)
 {
-    return FcDirCacheWrite (set, dir);
+    return FcDirCacheWrite (set, dirs, dir);
 }