diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-03-23 20:59:28 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-03-23 20:59:28 (GMT) |
| commit | 01c626fca98818554b8bfbe326bee0753ae9931c (patch) | |
| tree | 9b4effdd77d2735fe90d11dc21f9c22bbdd983dd /generic/tclIO.h | |
| parent | 72ae8dccf119510f1b175a9a2243a87069cef308 (diff) | |
| parent | 60a84571795909d2b51dff06349107716ae3ab6d (diff) | |
| download | tcl-01c626fca98818554b8bfbe326bee0753ae9931c.zip tcl-01c626fca98818554b8bfbe326bee0753ae9931c.tar.gz tcl-01c626fca98818554b8bfbe326bee0753ae9931c.tar.bz2 | |
Merge the checkins of the dgp-read-bytes branch onto the trunk, up to
and including checkin a1e82fb63e . Do not merge checkin bae1c688f2
which starts to take the dgp-read-bytes branch into directions apparently
unfriendly to stacked channels, which tests for [chan push] on the trunk
help us to detect.
Diffstat (limited to 'generic/tclIO.h')
| -rw-r--r-- | generic/tclIO.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/generic/tclIO.h b/generic/tclIO.h index e84f300..d1e1f23 100644 --- a/generic/tclIO.h +++ b/generic/tclIO.h @@ -252,9 +252,6 @@ typedef struct ChannelState { #define INPUT_SAW_CR (1<<12) /* Channel is in CRLF eol input * translation mode and the last byte * seen was a "\r". */ -#define INPUT_NEED_NL (1<<15) /* Saw a '\r' at end of last buffer, - * and there should be a '\n' at - * beginning of next buffer. */ #define CHANNEL_DEAD (1<<13) /* The channel has been closed by the * exit handler (on exit) but not * deallocated. When any IO operation @@ -274,29 +271,6 @@ typedef struct ChannelState { * changes. */ #define CHANNEL_RAW_MODE (1<<16) /* When set, notes that the Raw API is * being used. */ -#ifdef TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING -#define CHANNEL_TIMER_FEV (1<<17) /* When set the event we are notified - * by is a fileevent generated by a - * timer. We don't know if the driver - * has more data and should not try to - * read from it. If the system needs - * more than is in the buffers out - * read routines will simulate a short - * read (0 characters read) */ -#define CHANNEL_HAS_MORE_DATA (1<<18) /* Set by NotifyChannel for a channel - * if and only if the channel is - * configured non-blocking, the driver - * for said channel has no - * blockmodeproc, and data has arrived - * for reading at the OS level). A - * GetInput will pass reading from the - * driver if the channel is - * non-blocking, without blockmode - * proc and the flag has not been set. - * A read will be performed if the - * flag is set. This will reset the - * flag as well. */ -#endif /* TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING */ #define CHANNEL_INCLOSE (1<<19) /* Channel is currently being closed. * Its structures are still live and |