From 8245771d5a42dac36024411a0da047b9a7dc42c6 Mon Sep 17 00:00:00 2001
From: Patrick Lam <plam@MIT.EDU>
Date: Sun, 11 Sep 2005 02:16:09 +0000
Subject: Merge with HEAD and finish the GCC 4 cleanups (no more warnings!)

---
 fc-match/fc-match.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'fc-match')

diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 961a7a9..2a79722 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);
 	    }
-- 
cgit v1.2.3