[Emacs-diffs] Changes to emacs/src/ftfont.c,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/03/02 21:13:10

Index: ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ftfont.c    28 Feb 2008 12:54:31 -0000      1.7
+++ ftfont.c    2 Mar 2008 21:13:08 -0000       1.8
@@ -107,7 +107,7 @@
   Lisp_Object entity;
   FcChar8 *file, *fontformat;
   FcCharSet *charset;
-  char *str;
+  FcChar8 *str;
   int numeric;
   double dbl;
 
@@ -127,9 +127,9 @@
   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)
     {