From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Mar 2011 02:49:10 +0000 (-0700)
Subject: * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~38
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ff096c18cc923d5f3b936311d837edd91d8fbe9;p=emacs.git

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

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  <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 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);
     }