diff options
author | Damien Miller <djm@mindrot.org> | 2012-04-23 18:21:05 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-04-23 18:21:05 +1000 |
commit | ba77e1f67311fc76fe7ce460f7f03b6528383cbc (patch) | |
tree | edec032515c845e4512054b3f182bbce72c66495 | |
parent | 70b2d5550bd29c426414cca1d2ef9c2f6fbf5823 (diff) |
- djm@cvs.openbsd.org 2012/04/23 08:18:17
[channels.c]
fix function proto/source mismatch
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20120423 | ||
2 | - OpenBSD CVS Sync | ||
3 | - djm@cvs.openbsd.org 2012/04/23 08:18:17 | ||
4 | [channels.c] | ||
5 | fix function proto/source mismatch | ||
6 | |||
1 | 20120422 | 7 | 20120422 |
2 | - OpenBSD CVS Sync | 8 | - OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2012/02/29 11:21:26 | 9 | - 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 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.317 2012/04/11 13:16:19 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.318 2012/04/23 08:18:17 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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, | |||
2134 | */ | 2134 | */ |
2135 | void | 2135 | void |
2136 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | 2136 | channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp, |
2137 | u_int *nallocp, int *minwait_secs, int rekeying) | 2137 | u_int *nallocp, time_t *minwait_secs, int rekeying) |
2138 | { | 2138 | { |
2139 | u_int n, sz, nfdset; | 2139 | u_int n, sz, nfdset; |
2140 | 2140 | ||