diff options
| author | Damien Miller <djm@mindrot.org> | 2006-01-04 07:27:50 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-01-04 07:27:50 +1100 |
| commit | a969437645550a8f7595ba017c7658c4341d77d1 (patch) | |
| tree | 0e4dbb41d6d60114019bf4bc08b8d8803ffcc097 /channels.c | |
| parent | b797770da28c07a10b51528f79af3bacae2ff613 (diff) | |
- (djm) [channels.c] clean up harmless merge error, from reyk@
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels.c b/channels.c index ed5903f6f..5fa80fbad 100644 --- a/channels.c +++ b/channels.c | |||
| @@ -1491,8 +1491,6 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset) | |||
| 1491 | } | 1491 | } |
| 1492 | return 1; | 1492 | return 1; |
| 1493 | } | 1493 | } |
| 1494 | data = buffer_ptr(&c->output); | ||
| 1495 | dlen = buffer_len(&c->output); | ||
| 1496 | #ifdef _AIX | 1494 | #ifdef _AIX |
| 1497 | /* XXX: Later AIX versions can't push as much data to tty */ | 1495 | /* XXX: Later AIX versions can't push as much data to tty */ |
| 1498 | if (compat20 && c->wfd_isatty) | 1496 | if (compat20 && c->wfd_isatty) |