summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:19:42 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:19:42 +1100
commit3a4051e88b18b4290b07db7aec99adfffe566c96 (patch)
treeb424d01f2d20e69ed937eff85ce27e8f41cb8730
parenta9263d065d1db21c1d0661913673ed5c9b4d6467 (diff)
- stevesk@cvs.openbsd.org 2006/02/08 12:32:49
[includes.h misc.c] move #include <netinet/tcp.h> out of includes.h; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--includes.h3
-rw-r--r--misc.c5
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e00c31d5..95d2b76f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
[session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
[sshd.c sshpty.c]
move #include <paths.h> out of includes.h; ok markus@
+ - stevesk@cvs.openbsd.org 2006/02/08 12:32:49
+ [includes.h misc.c]
+ move #include <netinet/tcp.h> out of includes.h; ok markus@
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3932,4 +3935,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4148 2006/03/15 00:16:59 djm Exp $
+$Id: ChangeLog,v 1.4149 2006/03/15 00:19:42 djm Exp $
diff --git a/includes.h b/includes.h
index 85a907ce..bcc3b41f 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.26 2006/02/08 12:15:27 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.27 2006/02/08 12:32:49 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -140,7 +140,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
#include <netinet/in_systm.h> /* For typedefs */
#include <netinet/in.h> /* For IPv6 macros */
#include <netinet/ip.h> /* For IPTOS macros */
-#include <netinet/tcp.h>
#include <arpa/inet.h>
#if defined(HAVE_NETDB_H)
# include <netdb.h>
diff --git a/misc.c b/misc.c
index e85b773d..e4a47e61 100644
--- a/misc.c
+++ b/misc.c
@@ -24,8 +24,9 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.43 2006/02/08 12:15:27 stevesk Exp $");
-
+RCSID("$OpenBSD: misc.c,v 1.44 2006/02/08 12:32:49 stevesk Exp $");
+
+#include <netinet/tcp.h>
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif