- millert@cvs.openbsd.org 2005/11/15 11:59:54

     [includes.h]
     Include sys/queue.h explicitly instead of assuming some other header
     will pull it in.  At the moment it gets pulled in by sys/select.h
     (which ssh has no business including) via event.h.  OK markus@
     (ID sync only in -portable)

diff --git a/ChangeLog b/ChangeLog
index bba41890b8d2d8e6600987270eed77f446309f09..2d14c796d4693cc5505a8009ffccebda121526b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
    - deraadt@cvs.openbsd.org 2005/11/12 18:38:15
      [scp.c]
      avoid close(-1), as in rcp; ok cloder
+   - millert@cvs.openbsd.org 2005/11/15 11:59:54
+     [includes.h]
+     Include sys/queue.h explicitly instead of assuming some other header
+     will pull it in.  At the moment it gets pulled in by sys/select.h
+     (which ssh has no business including) via event.h.  OK markus@
+     (ID sync only in -portable)
 
 20051120
  - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what

diff --git a/includes.h b/includes.h
index fa65aa38d6bbcbc8eafa17b37dfae78e162d0544..351dd2ac03b6349bdd9abebc5488940aead2108b 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $       */
+/*     $OpenBSD: includes.h,v 1.20 2005/11/15 11:59:54 millert Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>