From 97f4d3083b036ce3e68d6346a6140a22123d5864 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sun, 30 Apr 2017 23:13:25 +0000 Subject: upstream commit remove compat20/compat13/compat15 variables ok markus@ Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c --- channels.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels.h') diff --git a/channels.h b/channels.h index ce43236d..77ec4f96 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.121 2017/02/01 02:59:09 dtucker Exp $ */ +/* $OpenBSD: channels.h,v 1.122 2017/04/30 23:13:25 djm Exp $ */ /* * Author: Tatu Ylonen @@ -200,11 +200,11 @@ struct Channel { /* check whether 'efd' is still in use */ #define CHANNEL_EFD_INPUT_ACTIVE(c) \ - (compat20 && c->extended_usage == CHAN_EXTENDED_READ && \ + (c->extended_usage == CHAN_EXTENDED_READ && \ (c->efd != -1 || \ buffer_len(&c->extended) > 0)) #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \ - (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \ + (c->extended_usage == CHAN_EXTENDED_WRITE && \ c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \ buffer_len(&c->extended) > 0)) -- cgit v1.2.3