From ba77e1f67311fc76fe7ce460f7f03b6528383cbc Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 23 Apr 2012 18:21:05 +1000 Subject: - djm@cvs.openbsd.org 2012/04/23 08:18:17 [channels.c] fix function proto/source mismatch --- ChangeLog | 6 ++++++ channels.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e928ac4d6..dedf2f33e 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 cacd2fe55..7791febd7 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 * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -2134,7 +2134,7 @@ channel_handler(chan_fn *ftab[], fd_set *readset, fd_set *writeset, */ 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; -- cgit v1.2.3