- 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

diff --git a/ChangeLog b/ChangeLog
index 0875cff27500f43d03195c6a71786971d0821f15..45663667852dad23a50acb4dcf973b6a29f70770 100644 (file)
--- 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

diff --git a/packet.c b/packet.c
index 81e402232a0c073fb1653d6ba7b7d787968473af..47e795db915db81b45ad07a24fde764d1617f4c7 100644 (file)
--- 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"