From: Andreas Schwab <schwab@suse.de>
Date: Sun, 2 Mar 2008 21:13:09 +0000 (+0000)
Subject: (ftfont_pattern_entity): Fix aliasing violations.
X-Git-Tag: emacs-pretest-23.0.90~7515
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f907fb2ebe68be9869021262a6a8011717fbe0a5;p=emacs.git

(ftfont_pattern_entity): Fix aliasing violations.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 82b9d08657b..0976b3175c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-02  Andreas Schwab  <schwab@suse.de>
 
+	* ftfont.c (ftfont_pattern_entity): Fix aliasing violations.
+
 	* coding.c (decode_coding_big5, produce_chars): Fix typos in last
 	change.
 
diff --git a/src/ftfont.c b/src/ftfont.c
index 834c4a6f07c..aac267b2095 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -107,7 +107,7 @@ ftfont_pattern_entity (p, frame, registry)
   Lisp_Object entity;
   FcChar8 *file, *fontformat;
   FcCharSet *charset;
-  char *str;
+  FcChar8 *str;
   int numeric;
   double dbl;
 
@@ -127,9 +127,9 @@ ftfont_pattern_entity (p, frame, registry)
   ASET (entity, FONT_FRAME_INDEX, frame);
   ASET (entity, FONT_OBJLIST_INDEX, Qnil);
 
-  if (FcPatternGetString (p, FC_FOUNDRY, 0, (FcChar8 **) &str) == FcResultMatch)
+  if (FcPatternGetString (p, FC_FOUNDRY, 0, &str) == FcResultMatch)
     ASET (entity, FONT_FOUNDRY_INDEX, intern_downcase (str, strlen (str)));
-  if (FcPatternGetString (p, FC_FAMILY, 0, (FcChar8 **) &str) == FcResultMatch)
+  if (FcPatternGetString (p, FC_FAMILY, 0, &str) == FcResultMatch)
     ASET (entity, FONT_FAMILY_INDEX, intern_downcase (str, strlen (str)));
   if (FcPatternGetInteger (p, FC_WEIGHT, 0, &numeric) == FcResultMatch)
     {