--- rxvt-unicode/src/init.h	2007/12/21 16:21:07	1.16
+++ rxvt-unicode/src/init.h	2011/12/21 11:13:43	1.20
@@ -1,18 +1,20 @@
 #ifndef INIT_H_
 #define INIT_H_
 
-#undef CERASE /* TODO */
-#define CERASE	'\010'	/* ^H */
-
 /* use the fastest baud-rate */
-#ifdef B38400
+//#if defined(B4000000)
+//# define BAUDRATE	B4000000
+//#elif defined(B921600)
+//# define BAUDRATE	B921600
+//#elif defined(B115200)
+//# define BAUDRATE	B115200
+//#elif defined(B38400)
+#if defined(B38400)
 # define BAUDRATE	B38400
+#elif defined(B19200)
+# define BAUDRATE	B19200
 #else
-# ifdef B19200
-#  define BAUDRATE	B19200
-# else
-#  define BAUDRATE	B9600
-# endif
+# define BAUDRATE	B9600
 #endif
 
 /* Disable special character functions */
@@ -32,7 +34,7 @@
 # define CQUIT		'\034'	/* ^\ */
 #endif
 #ifndef CERASE
-# ifdef linux
+# ifdef __linux__
 #  define CERASE	'\177'	/* ^? */
 # else
 #  define CERASE	'\010'	/* ^H */
@@ -81,9 +83,6 @@
 # endif
 #endif
 
-#ifndef O_NOCTTY
-# define O_NOCTTY	0
-#endif
 #ifndef ONLCR
 # define ONLCR		0
 #endif