- djm@cvs.openbsd.org 2001/03/13 22:42:54

[openssh.git] / ttymodes.c

diff --git a/ttymodes.c b/ttymodes.c
index a7a3e93010874dc1fdd04b89c21a930f630af9e6..65caf2ff852b3f20bac38ba2f4d64e469701d8e2 100644 (file)
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -15,10 +15,11 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ttymodes.c,v 1.8 2000/09/07 20:27:55 deraadt Exp $");
+RCSID("$OpenBSD: ttymodes.c,v 1.11 2001/03/10 15:02:05 stevesk Exp $");
 
 #include "packet.h"
-#include "ssh.h"
+#include "log.h"
+#include "ssh1.h"
 
 #define TTY_OP_END     0
 #define TTY_OP_ISPEED  192     /* int follows */
@@ -232,17 +233,11 @@ tty_make_modes(int fd)
   packet_put_char(OP); packet_put_char(tio.c_cc[NAME]);
 #define TTYMODE(NAME, FIELD, OP) \
   packet_put_char(OP); packet_put_char((tio.FIELD & NAME) != 0);
-#define SGTTYCHAR(NAME, OP)
-#define SGTTYMODE(NAME, FIELD, OP)
-#define SGTTYMODEN(NAME, FIELD, OP)
 
 #include "ttymodes.h"
 
 #undef TTYCHAR
 #undef TTYMODE
-#undef SGTTYCHAR
-#undef SGTTYMODE
-#undef SGTTYMODEN
 
        /* Mark end of mode data. */
        packet_put_char(TTY_OP_END);
@@ -302,17 +297,11 @@ tty_parse_modes(int fd, int *n_bytes_ptr)
          else                                          \
            tio.FIELD &= ~NAME;                         \
          break;
-#define SGTTYCHAR(NAME, OP)
-#define SGTTYMODE(NAME, FIELD, OP)
-#define SGTTYMODEN(NAME, FIELD, OP)
 
 #include "ttymodes.h"
 
 #undef TTYCHAR
 #undef TTYMODE
-#undef SGTTYCHAR
-#undef SGTTYMODE
-#undef SGTTYMODEN
 
                default:
                        debug("Ignoring unsupported tty mode opcode %d (0x%x)",