summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 13:07:48 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 13:07:48 +1100
commitdcf4ca110e751208400660317ae2cee6f28cbff9 (patch)
tree26dec67b1c91b14b4c616d498fdde4eff91bc052
parentaf87af165f25b7db22e32c0b2e55606bc68c450c (diff)
- (djm) [includes.h] Restore accidentally dropped netinet/in.h
-rw-r--r--ChangeLog3
-rw-r--r--includes.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index db0a4f633..1664c4fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -247,6 +247,7 @@
247 [openbsd-compat/sha2.c] First stab at portability glue for SHA256 247 [openbsd-compat/sha2.c] First stab at portability glue for SHA256
248 KEX support, should work with libc SHA256 support or OpenSSL 248 KEX support, should work with libc SHA256 support or OpenSSL
249 EVP_sha256 if present 249 EVP_sha256 if present
250 - (djm) [includes.h] Restore accidentally dropped netinet/in.h
250 251
25120060313 25220060313
252 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 253 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4148,4 +4149,4 @@
4148 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4149 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4149 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4150 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4150 4151
4151$Id: ChangeLog,v 1.4208 2006/03/15 02:02:28 djm Exp $ 4152$Id: ChangeLog,v 1.4209 2006/03/15 02:07:48 djm Exp $
diff --git a/includes.h b/includes.h
index c3da49ebd..800d23e90 100644
--- a/includes.h
+++ b/includes.h
@@ -125,6 +125,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
125#include <sys/ptms.h> /* for grantpt() and friends */ 125#include <sys/ptms.h> /* for grantpt() and friends */
126#endif 126#endif
127 127
128#include <netinet/in.h>
128#include <netinet/in_systm.h> /* For typedefs */ 129#include <netinet/in_systm.h> /* For typedefs */
129#include <arpa/inet.h> 130#include <arpa/inet.h>
130#if defined(HAVE_NETDB_H) 131#if defined(HAVE_NETDB_H)