--- rxvt-unicode/src/rxvt.h	2008/01/26 15:26:54	1.353
+++ rxvt-unicode/src/rxvt.h	2008/02/06 12:05:59	1.357
@@ -99,15 +99,6 @@
  * SYSTEM HACKS
  *****************************************************************************
  */
-/* Consistent defines - please report on the necessity
- * @ Unixware: defines (__svr4__)
- */
-#if defined (SVR4) && !defined (__svr4__)
-# define __svr4__ 1
-#endif
-#if defined (sun) && !defined (__sun__)
-# define __sun__ 1
-#endif
 
 #ifndef HAVE_XPOINTER
 typedef char *XPointer;
@@ -211,15 +202,6 @@
  *****************************************************************************
  */
 
-/* If we're using either the rxvt scrollbar, keep the
- * scrollColor resource.
- */
-#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
-# define KEEP_SCROLLCOLOR 1
-#else
-# undef KEEP_SCROLLCOLOR
-#endif
-
 /*
  * the 'essential' information for reporting Mouse Events
  * pared down from XButtonEvent
@@ -279,10 +261,6 @@
 
 #define scrollBar_esc           30
 
-#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
-# define HAVE_SCROLLBARS 1
-#endif
-
 #if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
 # define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
 #endif
@@ -503,8 +481,8 @@
 #ifdef OPTION_HC
   Color_HC,
 #endif
-#ifdef KEEP_SCROLLCOLOR
   Color_scroll,
+#ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
 #if ENABLE_TRANSPARENCY
@@ -514,7 +492,7 @@
   Color_fade,
 #endif
   NRS_COLORS,                 /* */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   Color_topShadow = NRS_COLORS,
   Color_bottomShadow,
   TOTAL_COLORS
@@ -1157,9 +1135,7 @@
   void x_cb (XEvent &xev);
   xevent_watcher termwin_ev;
   xevent_watcher vt_ev;
-#ifdef HAVE_SCROLLBARS
   xevent_watcher scrollbar_ev;
-#endif
 
   void child_cb (ev::child &w, int revents); ev::child child_ev;
   void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
@@ -1496,7 +1472,6 @@
   void resize_scrollbar ();
   int scrollbar_mapping (int map);
   int scrollbar_show (int update);
-  void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
 
   // xdefaults.C
   void get_options (int argc, const char *const *argv);