(ftfont_pattern_entity): Fix aliasing violations.

diff --git a/src/ChangeLog b/src/ChangeLog
index 82b9d08657b10a2d1be9f853160578e07e3c4dd2..0976b3175c9d1d57f920b3e666da6f80141bacec 100644 (file)
--- 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 834c4a6f07c9c68648f2b5cd4cb07107fba0a222..aac267b209558b1a5aa5090c21cadf6487348891 100644 (file)
--- 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)
     {