summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-01-17 11:00:13 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-01-17 11:00:13 +1100
commiteae5fa1b589a6d1ed3105326710c5d116eecf083 (patch)
treee9150a7960a70402e8eb170bec7debe38896f790
parent742cc1c19420db71275d3e8ef9fb86d96a463a4b (diff)
- (dtucker) [packet.c] Re-remove in_systm.h since it's already in includes.h
and multiple including it causes problems on old IRIXes. (It snuck back in during a sync.) Found (again) by Georg Schwarz.
-rw-r--r--ChangeLog7
-rw-r--r--packet.c1
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7682c5c54..bc202b0a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120070117
2 - (dtucker) [packet.c] Re-remove in_systm.h since it's already in includes.h
3 and multiple including it causes problems on old IRIXes. (It snuck back
4 in during a sync.) Found (again) by Georg Schwarz.
5
120070114 620070114
2 - (dtucker) [ssh-keygen.c] av -> argv to match earlier sync. 7 - (dtucker) [ssh-keygen.c] av -> argv to match earlier sync.
3 - (djm) [openbsd-compat/bsd-snprintf.c] Fix integer overflow in return 8 - (djm) [openbsd-compat/bsd-snprintf.c] Fix integer overflow in return
@@ -2669,4 +2674,4 @@
2669 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2674 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2670 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2675 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2671 2676
2672$Id: ChangeLog,v 1.4605 2007/01/14 10:20:30 djm Exp $ 2677$Id: ChangeLog,v 1.4606 2007/01/17 00:00:13 dtucker Exp $
diff --git a/packet.c b/packet.c
index ab5a01002..7d8fab1e9 100644
--- a/packet.c
+++ b/packet.c
@@ -47,7 +47,6 @@
47# include <sys/time.h> 47# include <sys/time.h>
48#endif 48#endif
49 49
50#include <netinet/in_systm.h>
51#include <netinet/in.h> 50#include <netinet/in.h>
52#include <netinet/ip.h> 51#include <netinet/ip.h>
53#include <arpa/inet.h> 52#include <arpa/inet.h>