diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-17 22:50:16 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-17 22:50:16 (GMT) |
commit | 95ffd01e5b7b40b48db8f03860caca475ad7fd0d (patch) | |
tree | c41007ac69759cc03e09d6b20c08001c29388e3f /generic/tclPkg.c | |
parent | e40b1e9bd2faac1726e399d4a60de0f6c8045c7a (diff) | |
parent | a04094e9a5e8e6e49dbfd80dea4d4d1335d51d6a (diff) | |
download | tcl-95ffd01e5b7b40b48db8f03860caca475ad7fd0d.zip tcl-95ffd01e5b7b40b48db8f03860caca475ad7fd0d.tar.gz tcl-95ffd01e5b7b40b48db8f03860caca475ad7fd0d.tar.bz2 |
Merge core-8-6-branch. Update outdated comment (cherry-pick [d5dec2b0514639f44929cbbba9c4130798a8a54a|d5dec2b051])
Diffstat (limited to 'generic/tclPkg.c')
-rw-r--r-- | generic/tclPkg.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 3b0554a..eb4dc9b 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -331,8 +331,8 @@ Tcl_PkgRequireEx( * * Second, how does this work? If we reach this point, then the global * variable tclEmptyStringRep has the value NULL. Compare that with - * the definition of tclEmptyStringRep near the top of the file - * generic/tclObj.c. It clearly should not have the value NULL; it + * the definition of tclEmptyStringRep near the top of this file. + * It clearly should not have the value NULL; it * should point to the char tclEmptyString. If we see it having the * value NULL, then somehow we are seeing a Tcl library that isn't * completely initialized, and that's an indicator for the error @@ -348,18 +348,11 @@ Tcl_PkgRequireEx( * After all, two Tcl libraries can't be a good thing!) * * Trouble is that's going to be tricky. We're now using a Tcl library - * that's not fully initialized. In particular, it doesn't have a - * proper value for tclEmptyStringRep. The Tcl_Obj system heavily - * depends on the value of tclEmptyStringRep and all of Tcl depends - * (increasingly) on the Tcl_Obj system, we need to correct that flaw - * before making the calls to set the interpreter result to the error - * message. That's the only flaw corrected; other problems with - * initialization of the Tcl library are not remedied, so be very - * careful about adding any other calls here without checking how they - * behave when initialization is incomplete. + * that's not fully initialized. Functions in it may not work + * reliably, so be very careful about adding any other calls here + * without checking how they behave when initialization is incomplete. */ - tclEmptyStringRep = &tclEmptyString; Tcl_SetObjResult(interp, Tcl_ObjPrintf( "Cannot load package \"%s\" in standalone executable:" " This package is not compiled with stub support", name)); |