2 files changed, 6 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cad37cd432b..889c261f204 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_draw_image_relief): Move declaration of extra to beginning.
+
 2010-05-06  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (CPP, LN_S): Remove unused variables.
diff --git a/src/xterm.c b/src/xterm.c
index ec550100cea..f867632f22f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2291,7 +2291,7 @@ static void
 x_draw_image_relief (s)
      struct glyph_string *s;
 {
-  int x0, y0, x1, y1, thick, raised_p;
+  int x0, y0, x1, y1, thick, raised_p, extra;
   XRectangle r;
   int x = s->x;
   int y = s->ybase - image_ascent (s->img, s->face, &s->slice);
@@ -2322,7 +2322,7 @@ x_draw_image_relief (s)
       raised_p = s->img->relief > 0;
     }
 
-  int extra = s->face->id == TOOL_BAR_FACE_ID
+  extra = s->face->id == TOOL_BAR_FACE_ID
     ? XINT (Vtool_bar_button_margin) : 0;
   
   x0 = x - thick - extra;