From 8ff096c18cc923d5f3b936311d837edd91d8fbe9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 18 Mar 2011 19:49:10 -0700 Subject: [PATCH] * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness. --- src/ChangeLog | 2 ++ src/ftfont.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b242465cef3..26833532ca4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-19 Paul Eggert + * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness. + * xfont.c (xfont_list_family): Mark var as initialized. * xml.c (make_dom): Now static. diff --git a/src/ftfont.c b/src/ftfont.c index db6b29421dc..0c3e7bb6428 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -311,8 +311,9 @@ ftfont_resolve_generic_family (Lisp_Object family, FcPattern *pattern) if (FcPatternGetLangSet (pattern, FC_LANG, 0, &langset) != FcResultMatch) { /* This is to avoid the effect of locale. */ + static const FcChar8 lang[] = "en"; langset = FcLangSetCreate (); - FcLangSetAdd (langset, "en"); + FcLangSetAdd (langset, lang); FcPatternAddLangSet (pattern, FC_LANG, langset); FcLangSetDestroy (langset); } -- 2.39.2