* ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.

diff --git a/src/ChangeLog b/src/ChangeLog
index b242465cef3d7c0368e05221626c51a6ceb134f7..26833532ca4496c86c8b9e744dd8c319f23a8585 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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 db6b29421dc117680b77859d35bc36b8ff61f1c4..0c3e7bb6428ba33d76608b45eea18b3c6bff4e4e 100644 (file)
--- 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);
     }