- stevesk@cvs.openbsd.org 2006/02/07 01:42:00

     [channels.c clientloop.c clientloop.h includes.h packet.h]
     [serverloop.c sshpty.c sshpty.h sshtty.c ttymodes.c]
     move #include <termios.h> out of includes.h; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 5110605bc424fb9df765e11efd3a525b2a698ea1..ab990c097f829a42e5c62b93a60e24911eff5359 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
    - stevesk@cvs.openbsd.org 2006/02/07 01:18:09
      [includes.h ssh-agent.c ssh-keyscan.c sshconnect2.c]
      move #include <sys/queue.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/02/07 01:42:00
+     [channels.c clientloop.c clientloop.h includes.h packet.h]
+     [serverloop.c sshpty.c sshpty.h sshtty.c ttymodes.c]
+     move #include <termios.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)

diff --git a/channels.c b/channels.c
index 1252f344673b8e4efb39dc25b7aa4638e8d1633b..78d4d918729cb100e479ab2c0f5bb25e2265297b 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.232 2006/01/30 12:22:22 reyk Exp $");
+RCSID("$OpenBSD: channels.c,v 1.233 2006/02/07 01:42:00 stevesk Exp $");
+
+#include <termios.h>
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/clientloop.c b/clientloop.c
index b76f7cfe05369cd11661ead9d068ecf913915066..c43a50b2524efef6665024e28e0adf516d470fff 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.149 2005/12/30 15:56:37 reyk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.150 2006/02/07 01:42:00 stevesk Exp $");
+
+#include <termios.h>
 
 #include "ssh.h"
 #include "ssh1.h"

diff --git a/clientloop.h b/clientloop.h
index aed2d918b1d7acdb2bf342f69120d27959febf3d..64cd956d280eede76195bbe4399655d528f38834 100644 (file)
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clientloop.h,v 1.14 2005/07/04 00:58:43 djm Exp $     */
+/*     $OpenBSD: clientloop.h,v 1.15 2006/02/07 01:42:00 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,6 +35,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <termios.h>
+
 /* Client side main loop for the interactive session. */
 int     client_loop(int, int, int);
 void    client_x11_get_proto(const char *, const char *, u_int,

diff --git a/includes.h b/includes.h
index b734f7d1b04f856c30e7f49a19d8c1528aecee36..db2f2f5a23a3ea3a06626ccff58e80d5edf30ec9 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: includes.h,v 1.24 2006/02/07 01:18:09 stevesk Exp $   */
+/*     $OpenBSD: includes.h,v 1.25 2006/02/07 01:42:00 stevesk Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -67,7 +67,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #  include <libc.h>
 #endif
 #include <unistd.h> /* For STDIN_FILENO, etc */
-#include <termios.h> /* Struct winsize */
 
 /*
  *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively

diff --git a/packet.h b/packet.h
index 8c23646aaae45c84c1bcdaa3f722254b66631e08..04123046af5cc2ee512a45d8c8e92e622941d63f 100644 (file)
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: packet.h,v 1.43 2005/07/25 11:59:40 markus Exp $      */
+/*     $OpenBSD: packet.h,v 1.44 2006/02/07 01:42:00 stevesk Exp $     */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,6 +16,8 @@
 #ifndef PACKET_H
 #define PACKET_H
 
+#include <termios.h>
+
 #include <openssl/bn.h>
 
 void     packet_set_connection(int, int);

diff --git a/serverloop.c b/serverloop.c
index 3d8e7cfb5a5c81e5d226bdb6fd95b0c7ea99bec8..23f8831ef04b894d49d8945a57a603931f1d78d1 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.124 2005/12/13 15:03:02 reyk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.125 2006/02/07 01:42:00 stevesk Exp $");
+
+#include <termios.h>
 
 #include "xmalloc.h"
 #include "packet.h"

diff --git a/sshpty.c b/sshpty.c
index 36788c4d794a69d62ba0bb457d960f97109f2be3..8ce8ee469e1fc60f30d33f2f85f591d142b8c1ea 100644 (file)
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.12 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.13 2006/02/07 01:42:00 stevesk Exp $");
+ 
+#include <termios.h>
 
 #ifdef HAVE_UTIL_H
 # include <util.h>

diff --git a/sshpty.h b/sshpty.h
index c0678de2219d7e6ae88df92549bd883d2aa0d4f7..a7de73700815cebe42e51319a72dce88bf93ddbb 100644 (file)
--- a/sshpty.h
+++ b/sshpty.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sshpty.h,v 1.5 2004/05/08 00:01:37 deraadt Exp $      */
+/*     $OpenBSD: sshpty.h,v 1.6 2006/02/07 01:42:00 stevesk Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -17,6 +17,8 @@
 #ifndef SSHPTY_H
 #define SSHPTY_H
 
+#include <termios.h>
+
 struct termios get_saved_tio(void);
 void    leave_raw_mode(void);
 void    enter_raw_mode(void);

diff --git a/sshtty.c b/sshtty.c
index 0b17c3e2d839717fe44d58584e6a4c0a2dc9d597..dcaba1830f0a4d6be368aa4786fe693231254e25 100644 (file)
--- a/sshtty.c
+++ b/sshtty.c
@@ -35,7 +35,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshtty.c,v 1.6 2004/05/08 00:01:37 deraadt Exp $");
+RCSID("$OpenBSD: sshtty.c,v 1.7 2006/02/07 01:42:00 stevesk Exp $");
+
+#include <termios.h>
 
 #include "sshpty.h"
 #include "log.h"

diff --git a/ttymodes.c b/ttymodes.c
index cf4c7d5c6c83e1130e202e52e16f7924b7bac28a..7f621e30e09990ac750f4e7bad3f8415d51e34f4 100644 (file)
--- a/ttymodes.c
+++ b/ttymodes.c
@@ -43,7 +43,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ttymodes.c,v 1.19 2003/04/08 20:21:29 itojun Exp $");
+RCSID("$OpenBSD: ttymodes.c,v 1.20 2006/02/07 01:42:00 stevesk Exp $");
+
+#include <termios.h>
 
 #include "packet.h"
 #include "log.h"