summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-04-09 21:05:52 +1000
committerDamien Miller <djm@mindrot.org>2003-04-09 21:05:52 +1000
commita0898b850538c127980454000c3759fadf15df12 (patch)
treeeac4a93e1e5a2b7701060e19d051f57ffe695210
parent996acd2476d9d34b18bb4f99012ea0927458f418 (diff)
- itojun@cvs.openbsd.org 2003/04/08 20:21:29
[*.c *.h] rename log() into logit() to avoid name conflict. markus ok, from netbsd - (djm) XXX - Performed locally using: "perl -p -i -e 's/(\s|^)log\(/$1logit\(/g' *.c *.h" - (djm) Fix up missing include for packet.c
-rw-r--r--ChangeLog14
-rw-r--r--packet.c2
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d94ea48..0fd7bc91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,18 @@
- markus@cvs.openbsd.org 2003/04/07 08:29:57
[monitor_wrap.c]
typo: get correct counters; introduced during rekeying change.
+ - millert@cvs.openbsd.org 2003/04/07 21:58:05
+ [progressmeter.c]
+ The UCB copyright here is incorrect. This code did not originate
+ at UCB, it was written by Luke Mewburn. Updated the copyright at
+ the author's request. markus@ OK
+ - itojun@cvs.openbsd.org 2003/04/08 20:21:29
+ [*.c *.h]
+ rename log() into logit() to avoid name conflict. markus ok, from
+ netbsd
+ - (djm) XXX - Performed locally using:
+ "perl -p -i -e 's/(\s|^)log\(/$1logit\(/g' *.c *.h"
+ - (djm) Fix up missing include for packet.c
20030402
- (bal) if IP_TOS is not found or broken don't try to compile in
@@ -1321,4 +1333,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2655 2003/04/09 10:51:24 djm Exp $
+$Id: ChangeLog,v 1.2656 2003/04/09 11:05:52 djm Exp $
diff --git a/packet.c b/packet.c
index 81e40223..47e795db 100644
--- a/packet.c
+++ b/packet.c
@@ -39,7 +39,7 @@
#include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.105 2003/04/02 09:48:07 markus Exp $");
-#include <sys/queue.h>
+#include "openbsd-compat/sys-queue.h"
#include "xmalloc.h"
#include "buffer.h"