Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.

[bpt/emacs.git] / src / xfaces.c

diff --git a/src/xfaces.c b/src/xfaces.c
index cdb398e..abfa70b 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3612,7 +3612,7 @@ x_update_menu_appearance (struct frame *f)
 #if defined HAVE_X_I18N
              char *fontsetname = xic_create_fontsetname (SDATA (xlfd), motif);
 #else
-             char *fontsetname = (char *) SDATA (xlfd);
+             char *fontsetname = SSDATA (xlfd);
 #endif
              sprintf (line, "%s.pane.menubar*font%s: %s",
                       myname, suffix, fontsetname);
@@ -3621,7 +3621,7 @@ x_update_menu_appearance (struct frame *f)
                       myname, popup_path, suffix, fontsetname);
              XrmPutLineResource (&rdb, line);
              changed_p = 1;
-             if (fontsetname != (char *) SDATA (xlfd))
+             if (fontsetname != SSDATA (xlfd))
                xfree (fontsetname);
            }
        }
@@ -6763,4 +6763,3 @@ a font of 10 point, we actually use a font of 10 * RESCALE-RATIO point.  */);
   defsubr (&Sx_family_fonts);
 #endif
 }
-