diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-05-20 00:52:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-05-20 00:52:22 (GMT) |
| commit | 584540c922511f7b03dd039bf4e7d09157878635 (patch) | |
| tree | 4086b674d5b1c5a50298b8e7417f33dad258ebab /generic/tclEnsemble.c | |
| parent | 9cea1455ec0d8bfae73216639af0a8b78f93967c (diff) | |
| parent | 9b49520dc25d320488342097655264f6ac4693cb (diff) | |
| download | tcl-584540c922511f7b03dd039bf4e7d09157878635.zip tcl-584540c922511f7b03dd039bf4e7d09157878635.tar.gz tcl-584540c922511f7b03dd039bf4e7d09157878635.tar.bz2 | |
merge 8.7 (resolve conflicts)
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 3c1f9ee..13408e1 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -165,7 +165,7 @@ TclNamespaceEnsembleCmd( const char *simpleName; int index, done; - if (nsPtr == NULL || nsPtr->flags & NS_DYING) { + if (nsPtr == NULL || nsPtr->flags & NS_DEAD) { if (!Tcl_InterpDeleted(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "tried to manipulate ensemble of deleted namespace", @@ -1730,7 +1730,7 @@ NsEnsembleImplementationCmdNR( return TCL_ERROR; } - if (ensemblePtr->nsPtr->flags & NS_DYING) { + if (ensemblePtr->nsPtr->flags & NS_DEAD) { /* * Don't know how we got here, but make things give up quickly. */ |