--- rxvt-unicode/src/rxvtperl.h	2006/01/25 00:42:21	1.21
+++ rxvt-unicode/src/rxvtperl.h	2011/02/21 07:41:03	1.23
@@ -6,21 +6,20 @@
 #define RXVTPERL_H_
 
 #if ENABLE_PERL
-# define SHOULD_INVOKE(htype) \
-    (  (htype) == HOOK_INIT		\
-    || (htype) == HOOK_DESTROY		\
-    || (htype) == HOOK_REFRESH_BEGIN	\
-    || (htype) == HOOK_REFRESH_END	\
-    || perl.should_invoke [htype])
-# define HOOK_INVOKE(args) rxvt_perl.invoke args
 
-#include "rxvt.h"
+#define SHOULD_INVOKE(htype) \
+   (  (htype) == HOOK_INIT		\
+   || (htype) == HOOK_DESTROY		\
+   || (htype) == HOOK_REFRESH_BEGIN	\
+   || (htype) == HOOK_REFRESH_END	\
+   || perl.should_invoke [htype])
+#define HOOK_INVOKE(args) rxvt_perl.invoke args
 
 enum data_type {
   DT_END,     // no further arguments
   DT_INT,
   DT_LONG,
-  DT_STR,     // 0-terminates string
+  DT_STR,     // 0-terminated string
   DT_STR_LEN, // string + length
   DT_WCS_LEN, // wchar_t* + length
   DT_LCS_LEN, // long* + length
@@ -55,8 +54,10 @@
 extern struct rxvt_perl_interp rxvt_perl;
 
 #else
-# define SHOULD_INVOKE(htype) false
-# define HOOK_INVOKE(args) false
+
+#define SHOULD_INVOKE(htype) false
+#define HOOK_INVOKE(args) false
+
 #endif
 
 #endif