diff options
author | Tim Rice <tim@multitalents.net> | 2006-03-14 22:09:50 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2006-03-14 22:09:50 -0800 |
commit | 4b23f7c660efee1b4158b6a9fa0197ff9f8f6692 (patch) | |
tree | 0619d11e785a5c4949cd60306e86af7465237d67 | |
parent | 7a4cf232c9861ccc5e824005ab696f73511f7520 (diff) |
- (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some
includes removed from includes.h
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/port-tun.c | 3 | ||||
-rw-r--r-- | sshpty.c | 1 |
3 files changed, 7 insertions, 2 deletions
@@ -265,7 +265,8 @@ | |||
265 | [openbsd-compat/readpassphrase.c] Lots of include fixes for | 265 | [openbsd-compat/readpassphrase.c] Lots of include fixes for |
266 | OpenSolaris | 266 | OpenSolaris |
267 | - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:" | 267 | - (tim) [includes.h] put sys/stat.h back in to quiet some "macro redefined:" |
268 | warnings. | 268 | - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some |
269 | includes removed from includes.h | ||
269 | 270 | ||
270 | 20060313 | 271 | 20060313 |
271 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 272 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4167,4 +4168,4 @@ | |||
4167 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4168 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4168 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4169 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4169 | 4170 | ||
4170 | $Id: ChangeLog,v 1.4219 2006/03/15 05:04:18 tim Exp $ | 4171 | $Id: ChangeLog,v 1.4220 2006/03/15 06:09:50 tim Exp $ |
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 31921615f..d09fe3d06 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c | |||
@@ -16,6 +16,9 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | #include <sys/ioctl.h> | ||
20 | #include <netinet/ip.h> | ||
21 | |||
19 | #include "log.h" | 22 | #include "log.h" |
20 | #include "misc.h" | 23 | #include "misc.h" |
21 | #include "bufaux.h" | 24 | #include "bufaux.h" |
@@ -17,6 +17,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.16 2006/02/20 17:19:54 stevesk Exp $"); | |||
17 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> |
18 | #include <sys/types.h> | 18 | #include <sys/types.h> |
19 | #include <sys/stat.h> | 19 | #include <sys/stat.h> |
20 | #include <signal.h> | ||
20 | 21 | ||
21 | #ifdef HAVE_PATHS_H | 22 | #ifdef HAVE_PATHS_H |
22 | # include <paths.h> | 23 | # include <paths.h> |