diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-01 10:51:52 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-01 10:51:52 (GMT) |
commit | a9843e57c2416046ee657b66dc7bd9e4fba46ff3 (patch) | |
tree | 2b31c0b522cabcc83bfbdc542d942ed04f6b9377 /generic/tclLoad.c | |
parent | 0468c659f572aac50eac5f2fbdd0b7be8948496c (diff) | |
parent | d99566171273e05f659f3f4f364b9d1948ec8565 (diff) | |
download | tcl-a9843e57c2416046ee657b66dc7bd9e4fba46ff3.zip tcl-a9843e57c2416046ee657b66dc7bd9e4fba46ff3.tar.gz tcl-a9843e57c2416046ee657b66dc7bd9e4fba46ff3.tar.bz2 |
Merge 8.7
Diffstat (limited to 'generic/tclLoad.c')
-rw-r--r-- | generic/tclLoad.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclLoad.c b/generic/tclLoad.c index f02cebc..e56fe47 100644 --- a/generic/tclLoad.c +++ b/generic/tclLoad.c @@ -115,7 +115,7 @@ static void LoadCleanupProc(ClientData clientData, int Tcl_LoadObjCmd( - TCL_UNUSED(ClientData), + TCL_UNUSED(void *), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -196,9 +196,9 @@ Tcl_LoadObjCmd( target = interp; if (objc == 4) { - const char *slaveIntName = TclGetString(objv[3]); + const char *childIntName = TclGetString(objv[3]); - target = Tcl_GetSlave(interp, slaveIntName); + target = Tcl_GetChild(interp, childIntName); if (target == NULL) { code = TCL_ERROR; goto done; @@ -540,7 +540,7 @@ Tcl_LoadObjCmd( int Tcl_UnloadObjCmd( - TCL_UNUSED(ClientData), + TCL_UNUSED(void *), Tcl_Interp *interp, /* Current interpreter. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ @@ -630,9 +630,9 @@ Tcl_UnloadObjCmd( target = interp; if (objc - i == 3) { - const char *slaveIntName = TclGetString(objv[i + 2]); + const char *childIntName = TclGetString(objv[i + 2]); - target = Tcl_GetSlave(interp, slaveIntName); + target = Tcl_GetChild(interp, childIntName); if (target == NULL) { return TCL_ERROR; } @@ -1085,7 +1085,7 @@ TclGetLoadedPackagesEx( return TCL_OK; } - target = Tcl_GetSlave(interp, targetName); + target = Tcl_GetChild(interp, targetName); if (target == NULL) { return TCL_ERROR; } |