- djm@cvs.openbsd.org 2012/04/23 08:18:17
[channels.c]
fix function proto/source mismatch
diff --git a/ChangeLog b/ChangeLog
index e928ac4..dedf2f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20120423
+ - OpenBSD CVS Sync
+ - djm@cvs.openbsd.org 2012/04/23 08:18:17
+ [channels.c]
+ fix function proto/source mismatch
+
20120422
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2012/02/29 11:21:26
diff --git a/channels.c b/channels.c
index cacd2fe..7791feb 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.317 2012/04/11 13:16:19 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.318 2012/04/23 08:18:17 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2134,7 +2134,7 @@
*/
void
channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
- u_int *nallocp, int *minwait_secs, int rekeying)
+ u_int *nallocp, time_t *minwait_secs, int rekeying)
{
u_int n, sz, nfdset;