import gdb-19990422 snapshot

[deliverable/binutils-gdb.git] / gdb / terminal.h

diff --git a/gdb/terminal.h b/gdb/terminal.h
index 7853d647227de4c272409d729ea64aabae884fd1..e7fb2cb4cde789e8b057b168049dc7613c070d1d 100644 (file)
--- a/gdb/terminal.h
+++ b/gdb/terminal.h
@@ -30,17 +30,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    thing. */
 
 /* nothing works with go32, and the headers aren't complete */
-#if !defined (__GO32__) && !defined (_WIN32)
+#if !defined (__GO32__)
 #if !defined (HAVE_TERMIOS) && !defined(HAVE_TERMIO) && !defined(HAVE_SGTTY)
 #if defined(HAVE_TERMIOS_H)
 #define HAVE_TERMIOS
-#elif defined(HAVE_TERMIO_H)
+#else /* ! defined (HAVE_TERMIOS_H) */
+#if defined(HAVE_TERMIO_H)
 #define HAVE_TERMIO
-#elif defined(HAVE_SGTTY_H)
+#else /* ! defined (HAVE_TERMIO_H) */
+#if defined(HAVE_SGTTY_H)
 #define HAVE_SGTTY
-#endif
-#endif
-#endif
+#endif /* ! defined (HAVE_SGTTY_H) */
+#endif /* ! defined (HAVE_TERMIO_H) */
+#endif /* ! defined (HAVE_TERMIOS_H) */
+#endif /* !defined (HAVE_TERMIOS) && !defined(HAVE_TERMIO) && !defined(HAVE_SGTTY) */
+#endif /* ! defined (__GO32__) */
 
 #if defined(HAVE_TERMIOS)
 #include <termios.h>