summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 e00c31d5a..95d2b76f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
31 [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c] 31 [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
32 [sshd.c sshpty.c] 32 [sshd.c sshpty.c]
33 move #include <paths.h> out of includes.h; ok markus@ 33 move #include <paths.h> out of includes.h; ok markus@
34 - stevesk@cvs.openbsd.org 2006/02/08 12:32:49
35 [includes.h misc.c]
36 move #include <netinet/tcp.h> out of includes.h; ok markus@
34 37
3520060313 3820060313
36 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 39 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3932,4 +3935,4 @@
3932 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3935 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3933 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3936 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3934 3937
3935$Id: ChangeLog,v 1.4148 2006/03/15 00:16:59 djm Exp $ 3938$Id: ChangeLog,v 1.4149 2006/03/15 00:19:42 djm Exp $
diff --git a/includes.h b/includes.h
index 85a907ceb..bcc3b41f2 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.26 2006/02/08 12:15:27 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.27 2006/02/08 12:32:49 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -140,7 +140,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
140#include <netinet/in_systm.h> /* For typedefs */ 140#include <netinet/in_systm.h> /* For typedefs */
141#include <netinet/in.h> /* For IPv6 macros */ 141#include <netinet/in.h> /* For IPv6 macros */
142#include <netinet/ip.h> /* For IPTOS macros */ 142#include <netinet/ip.h> /* For IPTOS macros */
143#include <netinet/tcp.h>
144#include <arpa/inet.h> 143#include <arpa/inet.h>
145#if defined(HAVE_NETDB_H) 144#if defined(HAVE_NETDB_H)
146# include <netdb.h> 145# include <netdb.h>
diff --git a/misc.c b/misc.c
index e85b773d0..e4a47e610 100644
--- a/misc.c
+++ b/misc.c
@@ -24,8 +24,9 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: misc.c,v 1.43 2006/02/08 12:15:27 stevesk Exp $"); 27RCSID("$OpenBSD: misc.c,v 1.44 2006/02/08 12:32:49 stevesk Exp $");
28 28
29#include <netinet/tcp.h>
29#ifdef HAVE_PATHS_H 30#ifdef HAVE_PATHS_H
30# include <paths.h> 31# include <paths.h>
31#endif 32#endif