* src/xfns.c (x_set_scroll_bar_default_width): Move declarations

before statements.

diff --git a/src/ChangeLog b/src/ChangeLog
index 34982819c285f5dbe3eedf5f91cfd46b3b26b3bd..9e80c2ec88ef2a73fd4c2540fc65a721e5ed1caa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * xfns.c (x_set_scroll_bar_default_width): Move declarations
+       before statements.
+
 2011-06-05  Jan Djärv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (xg_get_default_scrollbar_width): New function.

diff --git a/src/xfns.c b/src/xfns.c
index 2fd995df34128aa52d2499060a7bb93d34fdc8f4..34ffdbffbfe665d4f3b9f4e4a411f244730b156f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1696,12 +1696,13 @@ x_set_scroll_bar_default_width (struct frame *f)
 {
   int wid = FRAME_COLUMN_WIDTH (f);
   int minw = 16;
+  int width;
 #ifdef USE_TOOLKIT_SCROLL_BARS
 #ifdef USE_GTK
   minw = xg_get_default_scrollbar_width (f);
 #endif
   /* A minimum width of 14 doesn't look good for toolkit scroll bars.  */
-  int width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM;
+  width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM;
   FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid;
   FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width;
 #else