diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | includes.h | 4 | ||||
-rw-r--r-- | packet.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -43,6 +43,10 @@ | |||
43 | - stevesk@cvs.openbsd.org 2006/02/08 14:31:30 | 43 | - stevesk@cvs.openbsd.org 2006/02/08 14:31:30 |
44 | [includes.h ssh-agent.c ssh-keyscan.c ssh.c] | 44 | [includes.h ssh-agent.c ssh-keyscan.c ssh.c] |
45 | move #include <sys/resource.h> out of includes.h; ok markus@ | 45 | move #include <sys/resource.h> out of includes.h; ok markus@ |
46 | - stevesk@cvs.openbsd.org 2006/02/08 14:38:18 | ||
47 | [includes.h packet.c] | ||
48 | move #include <netinet/in_systm.h> and <netinet/ip.h> out of | ||
49 | includes.h; ok markus@ | ||
46 | 50 | ||
47 | 20060313 | 51 | 20060313 |
48 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 52 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3944,4 +3948,4 @@ | |||
3944 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3948 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3945 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3949 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3946 | 3950 | ||
3947 | $Id: ChangeLog,v 1.4152 2006/03/15 00:22:47 djm Exp $ | 3951 | $Id: ChangeLog,v 1.4153 2006/03/15 00:24:12 djm Exp $ |
diff --git a/includes.h b/includes.h index 27792e10a..60053b8d3 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.28 2006/02/08 14:31:30 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.29 2006/02/08 14:38:18 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -137,8 +137,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } | |||
137 | #endif | 137 | #endif |
138 | 138 | ||
139 | #include <netinet/in_systm.h> /* For typedefs */ | 139 | #include <netinet/in_systm.h> /* For typedefs */ |
140 | #include <netinet/in.h> /* For IPv6 macros */ | ||
141 | #include <netinet/ip.h> /* For IPTOS macros */ | ||
142 | #include <arpa/inet.h> | 140 | #include <arpa/inet.h> |
143 | #if defined(HAVE_NETDB_H) | 141 | #if defined(HAVE_NETDB_H) |
144 | # include <netdb.h> | 142 | # include <netdb.h> |
@@ -37,9 +37,11 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.120 2005/10/30 08:52:17 djm Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.121 2006/02/08 14:38:18 stevesk Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | #include <netinet/in_systm.h> | ||
44 | #include <netinet/ip.h> | ||
43 | 45 | ||
44 | #include "xmalloc.h" | 46 | #include "xmalloc.h" |
45 | #include "buffer.h" | 47 | #include "buffer.h" |