--- rxvt-unicode/src/rxvt.h	2006/01/02 18:20:23	1.182
+++ rxvt-unicode/src/rxvt.h	2006/01/04 02:37:30	1.185
@@ -240,9 +240,9 @@
 
 /* width of scrollBar, menuBar shadow, must be 1 or 2 */
 #ifdef HALFSHADOW
-# define SHADOW 1
+# define MENU_SHADOW 1
 #else
-# define SHADOW 2
+# define MENU_SHADOW 2
 #endif
 
 #define R_SB_ALIGN_CENTRE       0
@@ -471,6 +471,8 @@
 
   URxvt_view_up          = 720,
   URxvt_view_down        = 721,
+
+  URxvt_perl             = 777,
 };
 
 /* Words starting with `Color_' are colours.  Others are counts */
@@ -557,11 +559,11 @@
  * Resource list
  */
 enum {
-#define Rs_def(name) Rs_ ## name,
-#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
-#include "rsinc.h"
-#undef Rs_def
-#undef Rs_reserve
+# define def(name) Rs_ ## name,
+# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
+# include "rsinc.h"
+# undef def
+# undef reserve
   NUM_RESOURCES
 };
 
@@ -784,8 +786,8 @@
 
 #if (MENUBAR_MAX > 1)
 /* rendition style flags */
-# define menuBar_height()       (fheight + SHADOW)
-# define menuBar_TotalHeight()  (menuBar_height() + SHADOW + menuBar_margin)
+# define menuBar_height()       (fheight + MENU_SHADOW)
+# define menuBar_TotalHeight()  (menuBar_height() + MENU_SHADOW + menuBar_margin)
 # define isMenuBarWindow(w)     ((w) == menuBar.win)
 #else
 # define menuBar_height()       (0)