(struct scroll_bar): New member fringe_extended_p.

(w32_fill_area): Enclose multiple statements with do ... while (0).

1 files changed, 6 insertions, 2 deletions

diff --git a/src/w32term.h b/src/w32term.h
index 3bf7d588501..d809992b8ff 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -487,6 +487,10 @@ struct scroll_bar {
      place where the user grabbed it.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;
+
+  /* t if the background of the fringe that is adjacent to a scroll
+     bar is extended to the gap between the fringe and the bar.  */
+  Lisp_Object fringe_extended_p;
 };
 
 /* The number of elements a vector holding a struct scroll_bar needs.  */
@@ -576,14 +580,14 @@ extern void w32_fill_rect ();
 extern void w32_clear_window ();
 
 #define w32_fill_area(f,hdc,pix,x,y,nx,ny) \
-{ \
+do { \
     RECT rect; \
     rect.left = x; \
     rect.top = y; \
     rect.right = x + nx; \
     rect.bottom = y + ny; \
     w32_fill_rect (f,hdc,pix,&rect); \
-}
+} while (0)
 
 #define w32_clear_rect(f,hdc,lprect) \
 w32_fill_rect (f,hdc,f->output_data.x->background_pixel,lprect)