--- rxvt-unicode/src/rxvtlib.h.in	2004/12/01 02:12:18	1.42
+++ rxvt-unicode/src/rxvtlib.h.in	2005/04/17 22:36:13	1.46
@@ -22,7 +22,13 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include <cwchar>
+#if HAVE_CWCHAR
+# include <cwchar>
+#elif HAVE_WCHAR_H
+# include <wchar.h>
+#else
+// stdlib.h might provide it
+#endif
 
 #include "ptytty.h"
 
@@ -56,8 +62,8 @@
 
 extern rxvt_t rxvt_current_term;
 
-# define SET_R(r) rxvt_current_term = (r)
-# define GET_R rxvt_current_term
+#define SET_R(r) rxvt_current_term = (r)
+#define GET_R rxvt_current_term
 
 #define scrollbar_visible()    scrollBar.state
 #define menubar_visible()      menuBar.state
@@ -216,6 +222,7 @@
 # define Opt_borderLess		0
 #endif
 #define Opt_pastableTabs	(1UL<<25)
+#define Opt_cursorUnderline	(1UL<<26)
 /* place holder used for parsing command-line options */
 #define Opt_Reverse             (1UL<<30)
 #define Opt_Boolean             (1UL<<31)