RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2012/04/23 08:18:17 

[channels.c]
     fix function proto/source mismatch
This commit is contained in:
Damien Miller 2012-04-23 18:21:05 +10:00
parent 70b2d5550b
commit ba77e1f673
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 20120422
- OpenBSD CVS Sync - OpenBSD CVS Sync
- djm@cvs.openbsd.org 2012/02/29 11:21:26 - djm@cvs.openbsd.org 2012/02/29 11:21:26

4
channels.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2134,7 +2134,7 @@ channel_handler(chan_fn *ftab[], fd_set *readset, fd_set *writeset,
*/ */
void void
channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, 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; u_int n, sz, nfdset;