--- rxvt-unicode/src/init.h	2010/06/15 11:07:16	1.17
+++ rxvt-unicode/src/init.h	2011/12/21 11:13:43	1.20
@@ -2,13 +2,14 @@
 #define INIT_H_
 
 /* use the fastest baud-rate */
-#if defined(B4000000)
-# define BAUDRATE	B4000000
-#elif defined(B921600)
-# define BAUDRATE	B921600
-#elif defined(B115200)
-# define BAUDRATE	B115200
-#elif defined(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
@@ -33,7 +34,7 @@
 # define CQUIT		'\034'	/* ^\ */
 #endif
 #ifndef CERASE
-# ifdef linux
+# ifdef __linux__
 #  define CERASE	'\177'	/* ^? */
 # else
 #  define CERASE	'\010'	/* ^H */
@@ -82,9 +83,6 @@
 # endif
 #endif
 
-#ifndef O_NOCTTY
-# define O_NOCTTY	0
-#endif
 #ifndef ONLCR
 # define ONLCR		0
 #endif