diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-22 18:56:06 -0800 |
| commit | 51b59d794fe1d4a82fcd842b478657cc93f91595 (patch) | |
| tree | 25e57573403a13f3fe70934b40bf38c0190fd5ed /src/ftfont.c | |
| parent | 9e928ac989c824c376b1ab576a6da69cd86b12c6 (diff) | |
| download | emacs-51b59d794fe1d4a82fcd842b478657cc93f91595.tar.gz | |
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 372160dc0f6..e3edb45b14a 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -392,7 +392,7 @@ ftfont_lookup_cache (Lisp_Object key, enum ftfont_cache_for cache_for) 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 @@ ftfont_get_cache (FRAME_PTR f) 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 @@ ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font, 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 @@ syms_of_ftfont (void) ftfont_driver.type = Qfreetype; register_font_driver (&ftfont_driver, NULL); } - |