diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:13:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 09:42:37 +1000 |
| commit | 97f4d3083b036ce3e68d6346a6140a22123d5864 (patch) | |
| tree | 301c95453934721eca9855cd01b1d0da089e3246 /channels.h | |
| parent | 99f95ba82673d33215dce17bfa1512b57f54ec09 (diff) | |
upstream commit
remove compat20/compat13/compat15 variables
ok markus@
Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c
Diffstat (limited to 'channels.h')
| -rw-r--r-- | channels.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.h b/channels.h index ce43236d5..77ec4f966 100644 --- a/channels.h +++ b/channels.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: channels.h,v 1.121 2017/02/01 02:59:09 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.122 2017/04/30 23:13:25 djm Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| @@ -200,11 +200,11 @@ struct Channel { | |||
| 200 | 200 | ||
| 201 | /* check whether 'efd' is still in use */ | 201 | /* check whether 'efd' is still in use */ |
| 202 | #define CHANNEL_EFD_INPUT_ACTIVE(c) \ | 202 | #define CHANNEL_EFD_INPUT_ACTIVE(c) \ |
| 203 | (compat20 && c->extended_usage == CHAN_EXTENDED_READ && \ | 203 | (c->extended_usage == CHAN_EXTENDED_READ && \ |
| 204 | (c->efd != -1 || \ | 204 | (c->efd != -1 || \ |
| 205 | buffer_len(&c->extended) > 0)) | 205 | buffer_len(&c->extended) > 0)) |
| 206 | #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ | 206 | #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ |
| 207 | (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \ | 207 | (c->extended_usage == CHAN_EXTENDED_WRITE && \ |
| 208 | c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \ | 208 | c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \ |
| 209 | buffer_len(&c->extended) > 0)) | 209 | buffer_len(&c->extended) > 0)) |
| 210 | 210 | ||