aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-18 19:49:10 -0700
committerPaul Eggert2011-03-18 19:49:10 -0700
commit8ff096c18cc923d5f3b936311d837edd91d8fbe9 (patch)
tree84ce6b293ad64dbb71d99da386eb8cb8b228f71e /src
parente2be39f6afd7c24f3436740711fd1aeeb3fce3df (diff)
downloademacs-8ff096c18cc923d5f3b936311d837edd91d8fbe9.tar.gz
emacs-8ff096c18cc923d5f3b936311d837edd91d8fbe9.zip
* ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/ftfont.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b242465cef3..26833532ca4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12011-03-19 Paul Eggert <eggert@cs.ucla.edu> 12011-03-19 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * ftfont.c (ftfont_resolve_generic_family): Fix pointer signedness.
4
3 * xfont.c (xfont_list_family): Mark var as initialized. 5 * xfont.c (xfont_list_family): Mark var as initialized.
4 6
5 * xml.c (make_dom): Now static. 7 * 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)
311 if (FcPatternGetLangSet (pattern, FC_LANG, 0, &langset) != FcResultMatch) 311 if (FcPatternGetLangSet (pattern, FC_LANG, 0, &langset) != FcResultMatch)
312 { 312 {
313 /* This is to avoid the effect of locale. */ 313 /* This is to avoid the effect of locale. */
314 static const FcChar8 lang[] = "en";
314 langset = FcLangSetCreate (); 315 langset = FcLangSetCreate ();
315 FcLangSetAdd (langset, "en"); 316 FcLangSetAdd (langset, lang);
316 FcPatternAddLangSet (pattern, FC_LANG, langset); 317 FcPatternAddLangSet (pattern, FC_LANG, langset);
317 FcLangSetDestroy (langset); 318 FcLangSetDestroy (langset);
318 } 319 }