summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/inet_ntoa.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d450a855..bc5b49ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
[buffer.c channels.c version.h]
more malloc/fatal fixes; ok millert/deraadt; ghudson at MIT.EDU
- (djm) Crank RPM spec file versions
+ - (tim) [openbsd-compat/inet_ntoa.c] 20030917 "Sync with V_3_7 branch" undid
+ 20030916 "Missed dead header in inet_ntoa.c"
20030916
- (dtucker) [acconfig.h configure.ac defines.h session.c] Bug #252: Retrieve
@@ -1113,4 +1115,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2999 2003/09/16 21:32:17 djm Exp $
+$Id: ChangeLog,v 1.3000 2003/09/17 20:20:33 tim Exp $
diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index e0384491..f9fdc9ee 100644
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@@ -43,7 +43,6 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert E
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdio.h>
-#include "inet_ntoa.h"
char *inet_ntoa(struct in_addr in)
{