Merge: Minor changes for problems found by GCC 4.5.2's static checks.

[gnu-emacs] / src / widget.c

diff --git a/src/widget.c b/src/widget.c
index 72ee0e3ab91f70efe914c00082ace567c00da77a..3053ceaea133a66babd4f4d2fed2d31f9b363e16 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,6 +1,5 @@
 /* The emacs frame widget.
-   Copyright (C) 1992, 1993, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+   Copyright (C) 1992-1993, 2000-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -561,7 +560,7 @@ setup_frame_gcs (EmacsFrame ew)
   if (STRINGP (font))
     {
       XFontStruct *xfont = XLoadQueryFont (FRAME_X_DISPLAY_INFO (s)->display,
-                                          SDATA (font));
+                                          SSDATA (font));
       if (xfont)
        {
          gc_values.font = xfont->fid;
@@ -841,4 +840,3 @@ widget_store_internal_border (Widget widget)
 
   ew->emacs_frame.internal_border_width = f->internal_border_width;
 }
-