summaryrefslogtreecommitdiff
path: root/src/ftfont.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index 32e503b33f7..0853b8af67f 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -278,7 +278,7 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
struct font_driver ftfont_driver =
{
- (Lisp_Object) NULL, /* Qfreetype */
+ 0, /* Qfreetype */
ftfont_get_cache,
ftfont_list,
ftfont_match,
@@ -966,7 +966,7 @@ ftfont_font_format (FcPattern *pattern)
if (strcmp ((char *) str, "BDF") == 0)
return intern ("bdf");
#else /* not FC_FONTFORMAT */
- if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch)
+ if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
return Qnil;
if (strcasestr ((char *) str, ".ttf") == 0)
return intern ("truetype");