--- rxvt-unicode/src/scrollbar.C	2006/02/20 22:40:35	1.37
+++ rxvt-unicode/src/scrollbar.C	2007/12/29 14:25:43	1.40
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	scrollbar.C
  *----------------------------------------------------------------------*
  *
@@ -72,9 +72,9 @@
 #define R_SCROLLBEG_NEXT	0
 #define R_SCROLLEND_NEXT	szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
                                                     SB_PADDING)
-#define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + sb_shadow
+#define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + scrollBar.sb_shadow
 #define R_SCROLLEND_RXVT	szHint.height - R_SCROLLBEG_RXVT - \
-                                    (2 * sb_shadow)
+                                    (2 * scrollBar.sb_shadow)
 
 #if defined(PLAIN_SCROLLBAR)
   if (scrollBar.style == R_SB_PLAIN)
@@ -230,8 +230,8 @@
       width = min (i, SB_WIDTH_MAXIMUM);
 
 # ifdef RXVT_SCROLLBAR
-  if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    sb_shadow = SHADOW_WIDTH;
+  if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
+    scrollBar.sb_shadow = SHADOW_WIDTH;
 # endif
 
   scrollBar.style = style;