* etags.c (outf, outfiledir): renamed to tagf, tagfiledir.

[bpt/emacs.git] / src / systty.h

diff --git a/src/systty.h b/src/systty.h
index b92b024..5027633 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -53,6 +53,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef NO_TERMIO
 #include <termio.h>
 #endif /* not NO_TERMIO */
+#define INCLUDED_FCNTL
 #include <fcntl.h>
 #else
 #ifdef HAVE_TERMIOS
@@ -65,10 +66,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #include <termios.h>
 #endif /* _AIX && _I386 */
+#define INCLUDED_FCNTL
 #include <fcntl.h>
 #else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
 #ifndef VMS
+#ifndef MSDOS
 #include <sgtty.h>
+#endif
 #else /* VMS */
 #include <descrip.h>
 static struct iosb
@@ -351,11 +355,15 @@ struct emacs_tty {
 #else
 #ifdef VMS
   struct sensemode main;
+#else
+#ifdef MSDOS
+  int main;
 #else
   struct sgttyb main;
 #endif
 #endif
 #endif
+#endif
 
 /* If we have TERMIOS, we don't need to do this - they're taken care of
    by the tc*attr calls.  */
@@ -385,7 +393,11 @@ struct emacs_tty {
 
 #ifdef HAVE_TERMIOS
 
+#ifdef TABDLY
 #define EMACS_TTY_TABS_OK(p) (((p)->main.c_oflag & TABDLY) != TAB3)
+#else
+#define EMACS_TTY_TABS_OK(p) 1
+#endif
 
 #else /* not def HAVE_TERMIOS */
 #ifdef HAVE_TERMIO
@@ -399,7 +411,11 @@ struct emacs_tty {
 
 #else
 
+#ifdef MSDOS
+#define EMACS_TTY_TABS_OK(p) 0
+#else /* not MSDOS */
 #define EMACS_TTY_TABS_OK(p) (((p)->main.sg_flags & XTABS) != XTABS)
+#endif /* not MSDOS */
 
 #endif /* not def VMS */
 #endif /* not def HAVE_TERMIO */