diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-10 20:54:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-12-10 20:54:49 (GMT) |
| commit | 1f46b14efb4cff5cd99eecd20058ec3d98b283a5 (patch) | |
| tree | 155d0247e71240908708605203ad917c1faf9d96 /generic | |
| parent | c69e1e2500a8de36ee29f0220170bddaf320b3f1 (diff) | |
| parent | fb5daf45d18254aa262a8727aae8a18eb235f838 (diff) | |
| download | tcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.zip tcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.tar.gz tcl-1f46b14efb4cff5cd99eecd20058ec3d98b283a5.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIO.c | 2 | ||||
| -rw-r--r-- | generic/tclStubLib.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 5bd0e2a..0568d77 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -2472,7 +2472,7 @@ FlushChannel( * it's a tty channel (dup'ed underneath) */ - if (!GotFlag(statePtr, BG_FLUSH_SCHEDULED)) { + if (!GotFlag(statePtr, BG_FLUSH_SCHEDULED) && !TclInExit()) { SetFlag(statePtr, BG_FLUSH_SCHEDULED); UpdateInterest(chanPtr); } diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c index e48e60b..720d9ef 100644 --- a/generic/tclStubLib.c +++ b/generic/tclStubLib.c @@ -79,6 +79,7 @@ TclInitStubs( int magic) { const char *actualVersion = NULL; + ClientData pkgData = NULL; const TclStubs *stubsPtr; /* @@ -92,7 +93,7 @@ TclInitStubs( return NULL; } - actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, NULL); + actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, &pkgData); if (actualVersion == NULL) { return NULL; } @@ -122,7 +123,7 @@ TclInitStubs( } } } - tclStubsPtr = stubsPtr; + tclStubsPtr = (TclStubs *)pkgData; if (tclStubsPtr->hooks) { tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs; |