From: ayin <ayin>
Date: Tue, 11 Dec 2007 11:39:06 +0000 (+0000)
Subject: We require termios.h.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=56332bcecb35c3c4b575f96ea1c70160e9fc0171;p=dana%2Furxvt.git

We require termios.h.
---

diff --git a/configure.ac b/configure.ac
index c1753af5..f7c6e5ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -482,7 +482,6 @@ AC_CHECK_HEADERS( \
 	stdarg.h \
 	stdlib.h \
 	string.h \
-	termios.h \
 	unistd.h \
 	sys/byteorder.h \
 	sys/ioctl.h \
@@ -501,9 +500,8 @@ dnl# check to allow both <termios.h> and <sys/ioctl.h>
 AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_TERMIOS_H
 #include <termios.h>
-#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
+]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])])
 
 AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])])
diff --git a/src/init.C b/src/init.C
index 101ec96a..94c00a37 100644
--- a/src/init.C
+++ b/src/init.C
@@ -1228,7 +1228,6 @@ rxvt_get_ttymode (ttymode_t *tio, int erase)
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
 
@@ -1301,7 +1300,6 @@ rxvt_get_ttymode (ttymode_t *tio, int erase)
 
   fprintf (stderr, "\n");
 # undef FOO
-# endif /* HAVE_TERMIOS_H */
 #endif /* DEBUG_TTYMODE */
 }
 
diff --git a/src/main.C b/src/main.C
index 8c9fe7a2..7c80e236 100644
--- a/src/main.C
+++ b/src/main.C
@@ -40,9 +40,7 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef HAVE_TERMIOS_H
 # include <termios.h>
-#endif
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE