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

1 files changed, 4 insertions, 4 deletions

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 961a7a95..2a797227 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -167,17 +167,17 @@ main (int argc, char **argv)
 		FcChar8	*file;
 
 		if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) != FcResultMatch)
-		    file = "<unknown filename>";
+		    file = (FcChar8 *) "<unknown filename>";
 		else
 		{
-		    FcChar8 *slash = strrchr (file, '/');
+		    FcChar8 *slash = (FcChar8 *) strrchr ((char *) file, '/');
 		    if (slash)
 			file = slash+1;
 		}
 		if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &family) != FcResultMatch)
-		    family = "<unknown family>";
+		    family = (FcChar8 *) "<unknown family>";
 		if (FcPatternGetString (fs->fonts[j], FC_STYLE, 0, &style) != FcResultMatch)
-		    file = "<unknown style>";
+		    file = (FcChar8 *) "<unknown style>";
 
 		printf ("%s: \"%s\" \"%s\"\n", file, family, style);
 	    }