summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-22 19:41:33 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-22 19:41:33 +1100
commite8400da9d53700872c9dea6b9d52af98c59022b9 (patch)
tree0ff292a486ccc1090671dce8c351d6b7ecef1444
parent33f86bc2843b23c89f1b40e4250ced5b84e4c141 (diff)
- 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)
-rw-r--r--ChangeLog8
-rw-r--r--includes.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b04403b37..bfd187023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
6 - deraadt@cvs.openbsd.org 2005/11/12 18:38:15 6 - deraadt@cvs.openbsd.org 2005/11/12 18:38:15
7 [scp.c] 7 [scp.c]
8 avoid close(-1), as in rcp; ok cloder 8 avoid close(-1), as in rcp; ok cloder
9 - millert@cvs.openbsd.org 2005/11/15 11:59:54
10 [includes.h]
11 Include sys/queue.h explicitly instead of assuming some other header
12 will pull it in. At the moment it gets pulled in by sys/select.h
13 (which ssh has no business including) via event.h. OK markus@
14 (ID sync only in -portable)
9 15
1020051120 1620051120
11 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what 17 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what
@@ -3315,4 +3321,4 @@
3315 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3321 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3316 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3322 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3317 3323
3318$Id: ChangeLog,v 1.3998 2005/11/22 08:38:06 dtucker Exp $ 3324$Id: ChangeLog,v 1.3999 2005/11/22 08:41:33 dtucker Exp $
diff --git a/includes.h b/includes.h
index fa65aa38d..351dd2ac0 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.19 2005/05/19 02:42:26 djm Exp $ */ 1/* $OpenBSD: includes.h,v 1.20 2005/11/15 11:59:54 millert Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>