Mercurial > emacs
diff src/ftfont.c @ 112434:9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sat, 22 Jan 2011 18:56:06 -0800 |
| parents | ef719132ddfa |
| children |
line wrap: on
line diff
--- a/src/ftfont.c Sat Jan 22 17:09:09 2011 -0800 +++ b/src/ftfont.c Sat Jan 22 18:56:06 2011 -0800 @@ -392,7 +392,7 @@ if (cache_for == FTFONT_CACHE_FOR_FACE ? ! cache_data->ft_face : ! cache_data->fc_charset) { - char *filename = (char *) SDATA (XCAR (key)); + char *filename = SSDATA (XCAR (key)); int index = XINT (XCDR (key)); if (cache_for == FTFONT_CACHE_FOR_FACE) @@ -555,7 +555,7 @@ static int ftfont_get_charset (Lisp_Object registry) { - char *str = (char *) SDATA (SYMBOL_NAME (registry)); + char *str = SSDATA (SYMBOL_NAME (registry)); char *re = alloca (SBYTES (SYMBOL_NAME (registry)) * 2 + 1); Lisp_Object regexp; int i, j; @@ -2453,7 +2453,7 @@ flt_font_ft.flt_font.family = Mnil; else flt_font_ft.flt_font.family - = msymbol ((char *) SDATA (Fdowncase (SYMBOL_NAME (family)))); + = msymbol (SSDATA (Fdowncase (SYMBOL_NAME (family)))); } flt_font_ft.flt_font.x_ppem = ft_face->size->metrics.x_ppem; flt_font_ft.flt_font.y_ppem = ft_face->size->metrics.y_ppem; @@ -2675,4 +2675,3 @@ ftfont_driver.type = Qfreetype; register_font_driver (&ftfont_driver, NULL); } -