summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2012-04-23 08:18:17 +0000
committerdjm <djm@openbsd.org>2012-04-23 08:18:17 +0000
commit7f65dfab1e32ac2279930ae8158dc6eca9ca9e98 (patch)
treeb554d00cf0749963c5ee8e4b8cc4c52604ba2dc9
parentsync (diff)
downloadwireguard-openbsd-7f65dfab1e32ac2279930ae8158dc6eca9ca9e98.tar.xz
wireguard-openbsd-7f65dfab1e32ac2279930ae8158dc6eca9ca9e98.zip
fix function proto/source mismatch
-rw-r--r--usr.bin/ssh/channels.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 05cb66a8e55..635e4833cff 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/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
@@ -2112,7 +2112,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;