diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-25 10:04:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-25 10:04:58 (GMT) |
| commit | a8c158be4b6bd3dc3a0fc23faf26992246c8bcc4 (patch) | |
| tree | 231d897e2ebe2880bb9a06d76226aa9808b7036b /generic/tclIO.c | |
| parent | 6859fb45c25a8eb401e7d0decab9b77b24014627 (diff) | |
| parent | f09de888df51736f6e35a190ee1eef87b39048cf (diff) | |
| download | tcl-novem_unversioned_stub.zip tcl-novem_unversioned_stub.tar.gz tcl-novem_unversioned_stub.tar.bz2 | |
merge novem. Some more fixes.novem_unversioned_stub
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index c9842df..0ba441a 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -398,11 +398,11 @@ TclFinalizeIOSubsystem(void) int active = 1; /* Flag == 1 while there's still work to do */ int doflushnb; - /* Fetch the pre-TIP#398 compatibility flag */ + /* Fetch the pre-TIP#398 compatibility flag */ { const char *s; Tcl_DString ds; - + s = TclGetEnv("TCL_FLUSH_NONBLOCKING_ON_EXIT", &ds); doflushnb = ((s != NULL) && strcmp(s, "0")); if (s != NULL) { @@ -454,9 +454,9 @@ TclFinalizeIOSubsystem(void) /* Set the channel back into blocking mode to ensure that we wait * for all data to flush out. */ - + (void) Tcl_SetChannelOption(NULL, (Tcl_Channel) chanPtr, - "-blocking", "on"); + "-blocking", "on"); } if ((chanPtr == (Channel *) tsdPtr->stdinChannel) || @@ -8860,8 +8860,8 @@ Tcl_FileEventObjCmd( Tcl_WrongNumArgs(interp, 1, objv, "channelId event ?script?"); return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[2], modeOptions, "event name", 0, - &modeIndex) != TCL_OK) { + if (Tcl_GetIndexFromObjStruct(interp, objv[2], modeOptions, + sizeof(char *), "event name", 0, &modeIndex) != TCL_OK) { return TCL_ERROR; } mask = maskArray[modeIndex]; |