Use Tcl_EvalEx in pkgb.dll. Same functionality.

More deprecated function replacements

19 files changed, 117 insertions, 152 deletions

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 2c52ac8..8e897b4 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -6394,10 +6394,10 @@ extern TclStubs *tclStubsPtr;
 	Tcl_PkgProvideEx((interp), (name), (version), NULL)
 #undef Tcl_PkgRequire
 #define Tcl_PkgRequire(interp, name, version, exact) \
-	Tcl_PkgRequireEx((interp), (name), (version), (exact), NULL);
+	Tcl_PkgRequireEx((interp), (name), (version), (exact), NULL)
 #undef Tcl_PkgPresent
 #define Tcl_PkgPresent(interp, name, version, exact) \
-    Tcl_PkgPresentEx((interp), (name), (version), (exact), NULL);
+    Tcl_PkgPresentEx((interp), (name), (version), (exact), NULL)
 #undef  Tcl_Eval
 #define Tcl_Eval(interp,command) \
 	Tcl_EvalEx((interp),(command),-1,0)
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index b48eca2..4612e81 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -2873,7 +2873,7 @@ DictUpdateCmd(
 	}
 	if (objPtr == NULL) {
 	    /* ??? */
-	    Tcl_UnsetVar(interp, Tcl_GetString(objv[i+1]), 0);
+	    Tcl_UnsetVar2(interp, Tcl_GetString(objv[i+1]), NULL, 0);
 	} else if (Tcl_ObjSetVar2(interp, objv[i+1], NULL, objPtr,
 		TCL_LEAVE_ERR_MSG) == NULL) {
 	    TclDecrRefCount(dictPtr);
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 8266e54..48e6a99 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -1337,7 +1337,7 @@ Tcl_VwaitObjCmd(
 	return TCL_ERROR;
     }
     nameString = Tcl_GetString(objv[1]);
-    if (Tcl_TraceVar(interp, nameString,
+    if (Tcl_TraceVar2(interp, nameString, NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    VwaitVarProc, (ClientData) &done) != TCL_OK) {
 	return TCL_ERROR;
@@ -1350,7 +1350,7 @@ Tcl_VwaitObjCmd(
 	    break;
 	}
     }
-    Tcl_UntraceVar(interp, nameString,
+    Tcl_UntraceVar2(interp, nameString, NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    VwaitVarProc, (ClientData) &done);
 
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 2f76eb1..db47243 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8413,8 +8413,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];
diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c
index 21dcd71..45d19df 100644
--- a/generic/tclIOCmd.c
+++ b/generic/tclIOCmd.c
@@ -532,8 +532,8 @@ Tcl_SeekObjCmd(
     }
     mode = SEEK_SET;
     if (objc == 4) {
-	if (Tcl_GetIndexFromObj(interp, objv[3], originOptions, "origin", 0,
-		&optionIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], originOptions,
+		sizeof(char *), "origin", 0, &optionIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	mode = modeArray[optionIndex];
@@ -853,8 +853,8 @@ Tcl_ExecObjCmd(
 	if (string[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[skip], options, "switch",
-		TCL_EXACT, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[skip], options,
+		sizeof(char *), "switch", TCL_EXACT, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (index == EXEC_KEEPNEWLINE) {
@@ -1432,8 +1432,8 @@ Tcl_SocketObjCmd(
 	if (arg[0] != '-') {
 	    break;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[a], socketOptions, "option",
-		TCL_EXACT, &optionIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[a], socketOptions,
+		sizeof(char*), "option", TCL_EXACT, &optionIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch ((enum socketOptions) optionIndex) {
@@ -1628,8 +1628,8 @@ Tcl_FcopyObjCmd(
     toRead = -1;
     cmdPtr = NULL;
     for (i = 3; i < objc; i += 2) {
-	if (Tcl_GetIndexFromObj(interp, objv[i], switches, "switch", 0,
-		&index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[i], switches,
+		sizeof(char *), "switch", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch (index) {
@@ -1693,8 +1693,8 @@ ChanPendingObjCmd(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "mode", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+	    sizeof(char *), "mode", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/generic/tclIORChan.c b/generic/tclIORChan.c
index ca3ab4b..a18a79e 100644
--- a/generic/tclIORChan.c
+++ b/generic/tclIORChan.c
@@ -612,8 +612,8 @@ TclChanCreateObjCmd(
 
     methods = 0;
     while (listc > 0) {
-	if (Tcl_GetIndexFromObj(interp, listv[listc-1], methodNames,
-		"method", TCL_EXACT, &methIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, listv[listc-1], methodNames,
+		sizeof(char *), "method", TCL_EXACT, &methIndex) != TCL_OK) {
 	    TclNewLiteralStringObj(err, "chan handler \"");
 	    Tcl_AppendObjToObj(err, cmdObj);
 	    Tcl_AppendToObj(err, " initialize\" returned ", -1);
@@ -1932,8 +1932,8 @@ EncodeEventMask(
 
     events = 0;
     while (listc > 0) {
-	if (Tcl_GetIndexFromObj(interp, listv[listc-1], eventOptions,
-		objName, 0, &evIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, listv[listc-1], eventOptions,
+		sizeof(char *), objName, 0, &evIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch (evIndex) {
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 32a1360..51a5211 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -261,7 +261,7 @@ Tcl_EvalFile(
     int ret;
     Tcl_Obj *pathPtr = Tcl_NewStringObj(fileName,-1);
     Tcl_IncrRefCount(pathPtr);
-    ret = Tcl_FSEvalFile(interp, pathPtr);
+    ret = Tcl_FSEvalFileEx(interp, pathPtr, NULL);
     Tcl_DecrRefCount(pathPtr);
     return ret;
 }
@@ -2518,8 +2518,8 @@ TclFSFileAttrIndex(
 	Tcl_Obj *tmpObj = Tcl_NewStringObj(attributeName, -1);
 	int result;
 
-	result = Tcl_GetIndexFromObj(NULL, tmpObj, attrTable, NULL, TCL_EXACT,
-		indexPtr);
+	result = Tcl_GetIndexFromObjStruct(NULL, tmpObj, attrTable,
+		sizeof(char *), NULL, TCL_EXACT, indexPtr);
 	TclDecrRefCount(tmpObj);
 	if (listObj != NULL) {
 	    TclDecrRefCount(listObj);
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 25c1339..7613630 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -296,7 +296,7 @@ Tcl_Init(
     Tcl_Interp *interp)		/* Interpreter to initialize. */
 {
     if (tclPreInitScript != NULL) {
-	if (Tcl_Eval(interp, tclPreInitScript) == TCL_ERROR) {
+	if (Tcl_EvalEx(interp, tclPreInitScript, -1, 0) == TCL_ERROR) {
 	    return (TCL_ERROR);
 	};
     }
@@ -342,7 +342,7 @@ Tcl_Init(
      * alternate tclInit command before calling Tcl_Init().
      */
 
-    return Tcl_Eval(interp,
+    return Tcl_EvalEx(interp,
 "if {[namespace which -command tclInit] eq \"\"} {\n"
 "  proc tclInit {} {\n"
 "    global tcl_libPath tcl_library env tclDefaultLibrary\n"
@@ -404,7 +404,7 @@ Tcl_Init(
 "    error $msg\n"
 "  }\n"
 "}\n"
-"tclInit");
+"tclInit", -1, 0);
 }
 
 /*
@@ -577,8 +577,8 @@ Tcl_InterpObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options, sizeof(char *),
+	    "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch ((enum option) index) {
@@ -660,8 +660,8 @@ Tcl_InterpObjCmd(
 	last = 0;
 	for (i = 2; i < objc; i++) {
 	    if ((last == 0) && (Tcl_GetString(objv[i])[0] == '-')) {
-		if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
-			&index) != TCL_OK) {
+		if (Tcl_GetIndexFromObjStruct(interp, objv[i], options,
+			sizeof(char *), "option", 0, &index) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		if (index == OPT_SAFE) {
@@ -834,8 +834,8 @@ Tcl_InterpObjCmd(
 	    if (TclGetString(objv[i])[0] != '-') {
 		break;
 	    }
-	    if (Tcl_GetIndexFromObj(interp, objv[i], hiddenOptions, "option",
-		    0, &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], hiddenOptions,
+		    sizeof(char *), "option", 0, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (index == OPT_GLOBAL) {
@@ -881,8 +881,8 @@ Tcl_InterpObjCmd(
 	if (slaveInterp == NULL) {
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[3], limitTypes, "limit type", 0,
-		&limitType) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[3], limitTypes,
+		sizeof(char *), "limit type", 0, &limitType) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch ((enum LimitTypes) limitType) {
@@ -2264,8 +2264,8 @@ SlaveObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0,
-	    &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options, sizeof(char *),
+	    "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -2354,8 +2354,8 @@ SlaveObjCmd(
 	    if (TclGetString(objv[i])[0] != '-') {
 		break;
 	    }
-	    if (Tcl_GetIndexFromObj(interp, objv[i], hiddenOptions, "option",
-		    0, &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], hiddenOptions,
+		    sizeof(char *), "option", 0, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (index == OPT_GLOBAL) {
@@ -2392,8 +2392,8 @@ SlaveObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "limitType ?options?");
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[2], limitTypes, "limit type", 0,
-		&limitType) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[2], limitTypes,
+		sizeof(char *), "limit type", 0, &limitType) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch ((enum LimitTypes) limitType) {
@@ -2511,8 +2511,8 @@ SlaveDebugCmd(
 		Tcl_NewBooleanObj(iPtr->flags & INTERP_DEBUG_FRAME));
 	Tcl_SetObjResult(interp, resultPtr);
     } else {
-	if (Tcl_GetIndexFromObj(interp, objv[0], debugTypes,
-			"debug option", 0, &debugType) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[0], debugTypes,
+			sizeof(char *), "debug option", 0, &debugType) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if (debugType == DEBUG_TYPE_FRAME) {
@@ -2926,8 +2926,8 @@ Tcl_MakeSafe(
 	 * Assume these functions all work. [Bug 2895741]
 	 */
 
-	(void) Tcl_Eval(interp,
-		"namespace eval ::tcl {namespace eval mathfunc {}}");
+	(void) Tcl_EvalEx(interp,
+		"namespace eval ::tcl {namespace eval mathfunc {}}", -1, 0);
 	(void) Tcl_CreateAlias(interp, "::tcl::mathfunc::min", master,
 		"::tcl::mathfunc::min", 0, NULL);
 	(void) Tcl_CreateAlias(interp, "::tcl::mathfunc::max", master,
@@ -2945,7 +2945,7 @@ Tcl_MakeSafe(
      * No env array in a safe slave.
      */
 
-    Tcl_UnsetVar(interp, "env", TCL_GLOBAL_ONLY);
+    Tcl_UnsetVar2(interp, "env", NULL, TCL_GLOBAL_ONLY);
 
     /*
      * Remove unsafe parts of tcl_platform
@@ -2961,9 +2961,9 @@ Tcl_MakeSafe(
      * nameofexecutable])
      */
 
-    Tcl_UnsetVar(interp, "tclDefaultLibrary", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar(interp, "tcl_library", TCL_GLOBAL_ONLY);
-    Tcl_UnsetVar(interp, "tcl_pkgPath", TCL_GLOBAL_ONLY);
+    Tcl_UnsetVar2(interp, "tclDefaultLibrary", NULL, TCL_GLOBAL_ONLY);
+    Tcl_UnsetVar2(interp, "tcl_library", NULL, TCL_GLOBAL_ONLY);
+    Tcl_UnsetVar2(interp, "tcl_pkgPath", NULL, TCL_GLOBAL_ONLY);
 
     /*
      * Remove the standard channels from the interpreter; safe interpreters do
@@ -4186,8 +4186,8 @@ SlaveCommandLimitCmd(
 	Tcl_SetObjResult(interp, dictPtr);
 	return TCL_OK;
     } else if (objc == consumedObjc+1) {
-	if (Tcl_GetIndexFromObj(interp, objv[consumedObjc], options, "option",
-		0, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[consumedObjc], options,
+		sizeof(char *), "option", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch ((enum Options) index) {
@@ -4224,8 +4224,8 @@ SlaveCommandLimitCmd(
 	int gran = 0, limit = 0;
 
 	for (i=consumedObjc ; i<objc ; i+=2) {
-	    if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
-		    &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], options,
+		    sizeof(char *), "option", 0, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    switch ((enum Options) index) {
@@ -4376,8 +4376,8 @@ SlaveTimeLimitCmd(
 	Tcl_SetObjResult(interp, dictPtr);
 	return TCL_OK;
     } else if (objc == consumedObjc+1) {
-	if (Tcl_GetIndexFromObj(interp, objv[consumedObjc], options, "option",
-		0, &index) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[consumedObjc], options,
+		sizeof(char *), "option", 0, &index) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	switch ((enum Options) index) {
@@ -4429,8 +4429,8 @@ SlaveTimeLimitCmd(
 
 	Tcl_LimitGetTime(slaveInterp, &limitMoment);
 	for (i=consumedObjc ; i<objc ; i+=2) {
-	    if (Tcl_GetIndexFromObj(interp, objv[i], options, "option", 0,
-		    &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[i], options, sizeof(char *),
+		    "option", 0, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    switch ((enum Options) index) {
diff --git a/generic/tclLink.c b/generic/tclLink.c
index f7911a4..c1bdaea 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -112,8 +112,8 @@ Tcl_LinkVar(
     Link *linkPtr;
     int code;
 
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
+    linkPtr = (Link *) Tcl_VarTraceInfo2(interp, varName, NULL,
+	    TCL_GLOBAL_ONLY, LinkTraceProc, (ClientData) NULL);
     if (linkPtr != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"variable '%s' is already linked", varName));
@@ -138,9 +138,9 @@ Tcl_LinkVar(
 	ckfree((char *) linkPtr);
 	return TCL_ERROR;
     }
-    code = Tcl_TraceVar(interp, varName, TCL_GLOBAL_ONLY|TCL_TRACE_READS
-	    |TCL_TRACE_WRITES|TCL_TRACE_UNSETS, LinkTraceProc,
-	    (ClientData) linkPtr);
+    code = Tcl_TraceVar2(interp, varName, NULL,
+	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+	    LinkTraceProc, (ClientData) linkPtr);
     if (code != TCL_OK) {
 	Tcl_DecrRefCount(linkPtr->varName);
 	ckfree((char *) linkPtr);
@@ -173,12 +173,12 @@ Tcl_UnlinkVar(
 {
     Link *linkPtr;
 
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
+    linkPtr = (Link *) Tcl_VarTraceInfo2(interp, varName, NULL,
+	    TCL_GLOBAL_ONLY, LinkTraceProc, (ClientData) NULL);
     if (linkPtr == NULL) {
 	return;
     }
-    Tcl_UntraceVar(interp, varName,
+    Tcl_UntraceVar2(interp, varName, NULL,
 	    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 	    LinkTraceProc, (ClientData) linkPtr);
     Tcl_DecrRefCount(linkPtr->varName);
@@ -212,8 +212,8 @@ Tcl_UpdateLinkedVar(
     Link *linkPtr;
     int savedFlag;
 
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
+    linkPtr = (Link *) Tcl_VarTraceInfo2(interp, varName, NULL,
+	    TCL_GLOBAL_ONLY, LinkTraceProc, (ClientData) NULL);
     if (linkPtr == NULL) {
 	return;
     }
@@ -224,8 +224,8 @@ Tcl_UpdateLinkedVar(
     /*
      * Callback may have unlinked the variable. [Bug 1740631]
      */
-    linkPtr = (Link *) Tcl_VarTraceInfo(interp, varName, TCL_GLOBAL_ONLY,
-	    LinkTraceProc, (ClientData) NULL);
+    linkPtr = (Link *) Tcl_VarTraceInfo2(interp, varName, NULL,
+	    TCL_GLOBAL_ONLY, LinkTraceProc, (ClientData) NULL);
     if (linkPtr != NULL) {
 	linkPtr->flags = (linkPtr->flags & ~LINK_BEING_UPDATED) | savedFlag;
     }
@@ -281,7 +281,7 @@ LinkTraceProc(
 	} else if (flags & TCL_TRACE_DESTROYED) {
 	    Tcl_ObjSetVar2(interp, linkPtr->varName, NULL, ObjValue(linkPtr),
 		    TCL_GLOBAL_ONLY);
-	    Tcl_TraceVar(interp, Tcl_GetString(linkPtr->varName),
+	    Tcl_TraceVar2(interp, Tcl_GetString(linkPtr->varName), NULL,
 		    TCL_GLOBAL_ONLY|TCL_TRACE_READS|TCL_TRACE_WRITES
 		    |TCL_TRACE_UNSETS, LinkTraceProc, (ClientData) linkPtr);
 	}
diff --git a/generic/tclMain.c b/generic/tclMain.c
index e422806..5a380ff 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -13,9 +13,6 @@
 
 #include "tclInt.h"
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
 /*
  * The default prompt used when the user has not overridden it.
  */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index e371aa0..ea955b0 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -569,10 +569,10 @@ EstablishErrorCodeTraces(
     const char *name2,
     int flags)
 {
-    Tcl_TraceVar(interp, "errorCode", TCL_GLOBAL_ONLY | TCL_TRACE_READS,
-	    ErrorCodeRead, NULL);
-    Tcl_TraceVar(interp, "errorCode", TCL_GLOBAL_ONLY | TCL_TRACE_UNSETS,
-	    EstablishErrorCodeTraces, NULL);
+    Tcl_TraceVar2(interp, "errorCode", NULL,
+	    TCL_GLOBAL_ONLY | TCL_TRACE_READS, ErrorCodeRead, NULL);
+    Tcl_TraceVar2(interp, "errorCode", NULL,
+	    TCL_GLOBAL_ONLY | TCL_TRACE_UNSETS, EstablishErrorCodeTraces, NULL);
     return NULL;
 }
 
@@ -643,10 +643,10 @@ EstablishErrorInfoTraces(
     const char *name2,
     int flags)
 {
-    Tcl_TraceVar(interp, "errorInfo", TCL_GLOBAL_ONLY | TCL_TRACE_READS,
-	    ErrorInfoRead, NULL);
-    Tcl_TraceVar(interp, "errorInfo", TCL_GLOBAL_ONLY | TCL_TRACE_UNSETS,
-	    EstablishErrorInfoTraces, NULL);
+    Tcl_TraceVar2(interp, "errorInfo", NULL,
+	    TCL_GLOBAL_ONLY | TCL_TRACE_READS, ErrorInfoRead, NULL);
+    Tcl_TraceVar2(interp, "errorInfo", NULL,
+	    TCL_GLOBAL_ONLY | TCL_TRACE_UNSETS, EstablishErrorInfoTraces, NULL);
     return NULL;
 }
 
diff --git a/generic/tclTest.c b/generic/tclTest.c
index a0dcdc0..e9e4312 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -532,14 +532,8 @@ static Tcl_Filesystem simpleFilesystem = {
 };
 
 
-/*
- * External (platform specific) initialization routine, these declarations
- * explicitly don't use EXTERN since this code does not get compiled into the
- * library:
- */
-
-extern int		TclplatformtestInit(Tcl_Interp *interp);
-extern int		TclThread_Init(Tcl_Interp *interp);
+MODULE_SCOPE int	TclplatformtestInit(Tcl_Interp *interp);
+MODULE_SCOPE int	TclThread_Init(Tcl_Interp *interp);
 
 /*
  *----------------------------------------------------------------------
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c
index 960c7dc..0482822 100644
--- a/generic/tclThreadTest.c
+++ b/generic/tclThreadTest.c
@@ -113,22 +113,16 @@ static char *errorProcString;
 
 TCL_DECLARE_MUTEX(threadMutex)
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-EXTERN int		TclThread_Init(Tcl_Interp *interp);
-EXTERN int		Tcl_ThreadObjCmd(ClientData clientData,
+DLLEXPORT int	TclThread_Init(Tcl_Interp *interp);
+DLLEXPORT int	Tcl_ThreadObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
-EXTERN int		TclCreateThread(Tcl_Interp *interp, char *script,
+DLLEXPORT int	TclCreateThread(Tcl_Interp *interp, char *script,
 			    int joinable);
-EXTERN int		TclThreadList(Tcl_Interp *interp);
-EXTERN int		TclThreadSend(Tcl_Interp *interp, Tcl_ThreadId id,
+DLLEXPORT int	TclThreadList(Tcl_Interp *interp);
+DLLEXPORT int	TclThreadSend(Tcl_Interp *interp, Tcl_ThreadId id,
 			    char *script, int wait);
 
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
 Tcl_ThreadCreateType	NewTestThread(ClientData clientData);
 static void		ListRemove(ThreadSpecificData *tsdPtr);
 static void		ListUpdateInner(ThreadSpecificData *tsdPtr);
diff --git a/generic/tclTimer.c b/generic/tclTimer.c
index 33838ec..84967f1 100644
--- a/generic/tclTimer.c
+++ b/generic/tclTimer.c
@@ -810,8 +810,8 @@ Tcl_AfterObjCmd(
 	|| objv[1]->typePtr == &tclWideIntType
 #endif
 	|| objv[1]->typePtr == &tclBignumType
-	|| ( Tcl_GetIndexFromObj(NULL, objv[1], afterSubCmds, "", 0, 
-				 &index) != TCL_OK )) {
+	|| ( Tcl_GetIndexFromObjStruct(NULL, objv[1], afterSubCmds,
+				sizeof(char *), NULL, 0, &index) != TCL_OK )) {
 	index = -1;
 	if (Tcl_GetWideIntFromObj(NULL, objv[1], &ms) != TCL_OK) {
 	    Tcl_AppendResult(interp, "bad argument \"",
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 37a1a23..4ecb7da 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -198,8 +198,8 @@ Tcl_TraceObjCmd(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], traceOptions,
-		"option", 0, &optionIndex) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], traceOptions,
+		sizeof(char *), "option", 0, &optionIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch ((enum traceOptions) optionIndex) {
@@ -217,8 +217,8 @@ Tcl_TraceObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "type ?arg arg ...?");
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[2], traceTypeOptions, "option",
-		0, &typeIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[2], traceTypeOptions,
+		sizeof(char *), "option", 0, &typeIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	return (traceSubCmds[typeIndex])(interp, optionIndex, objc, objv);
@@ -240,8 +240,8 @@ Tcl_TraceObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "type name");
 	    return TCL_ERROR;
 	}
-	if (Tcl_GetIndexFromObj(interp, objv[2], traceTypeOptions, "option",
-		0, &typeIndex) != TCL_OK) {
+	if (Tcl_GetIndexFromObjStruct(interp, objv[2], traceTypeOptions,
+		sizeof(char *), "option", 0, &typeIndex) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	return (traceSubCmds[typeIndex])(interp, optionIndex, objc, objv);
@@ -307,7 +307,7 @@ Tcl_TraceObjCmd(
 	resultListPtr = Tcl_NewObj();
 	clientData = 0;
 	name = Tcl_GetString(objv[2]);
-	while ((clientData = Tcl_VarTraceInfo(interp, name, 0,
+	while ((clientData = Tcl_VarTraceInfo2(interp, name, NULL, 0,
 		TraceVarProc, clientData)) != 0) {
 
 	    TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData;
@@ -426,8 +426,8 @@ TraceExecutionObjCmd(
 	    return TCL_ERROR;
 	}
 	for (i = 0; i < listLen; i++) {
-	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
-		    "operation", TCL_EXACT, &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, elemPtrs[i], opStrings,
+		    sizeof(char *), "operation", TCL_EXACT, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    switch ((enum operations) index) {
@@ -673,8 +673,8 @@ TraceCommandObjCmd(
 	}
 
 	for (i = 0; i < listLen; i++) {
-	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
-		    "operation", TCL_EXACT, &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, elemPtrs[i], opStrings,
+		    sizeof(char *), "operation", TCL_EXACT, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    switch ((enum operations) index) {
@@ -874,8 +874,8 @@ TraceVariableObjCmd(
 	    return TCL_ERROR;
 	}
 	for (i = 0; i < listLen ; i++) {
-	    if (Tcl_GetIndexFromObj(interp, elemPtrs[i], opStrings,
-		    "operation", TCL_EXACT, &index) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, elemPtrs[i], opStrings,
+		    sizeof(char *), "operation", TCL_EXACT, &index) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    switch ((enum operations) index) {
@@ -927,7 +927,7 @@ TraceVariableObjCmd(
 	    TraceVarInfo *tvarPtr;
 	    ClientData clientData = 0;
 	    name = Tcl_GetString(objv[3]);
-	    while ((clientData = Tcl_VarTraceInfo(interp, name, 0,
+	    while ((clientData = Tcl_VarTraceInfo2(interp, name, NULL, 0,
 		    TraceVarProc, clientData)) != 0) {
 		tvarPtr = (TraceVarInfo *) clientData;
 		if ((tvarPtr->length == length)
@@ -955,8 +955,8 @@ TraceVariableObjCmd(
 	resultListPtr = Tcl_NewObj();
 	clientData = 0;
 	name = Tcl_GetString(objv[3]);
-	while ((clientData = Tcl_VarTraceInfo(interp, name, 0, TraceVarProc,
-		clientData)) != 0) {
+	while ((clientData = Tcl_VarTraceInfo2(interp, name, NULL, 0,
+		TraceVarProc, clientData)) != 0) {
 	    Tcl_Obj *opObj;
 	    TraceVarInfo *tvarPtr = (TraceVarInfo *) clientData;
 
@@ -1883,7 +1883,7 @@ TraceExecutionProc(
 	     * interpreter.
 	     */
 
-	    traceCode = Tcl_Eval(interp, Tcl_DStringValue(&cmd));
+	    traceCode = Tcl_EvalEx(interp, Tcl_DStringValue(&cmd), -1, 0);
 	    tcmdPtr->flags &= ~TCL_TRACE_EXEC_IN_PROGRESS;
 
 	    /*
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 9cebe83..6d6daed 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -2766,8 +2766,8 @@ Tcl_ArrayObjCmd(
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetIndexFromObj(interp, objv[1], arrayOptions, "option",
-	    0, &index) != TCL_OK) {
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], arrayOptions,
+	    sizeof(char *), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -3097,8 +3097,8 @@ Tcl_ArrayObjCmd(
 	} else if (objc == 5) {
 	    patternPtr = objv[4];
 	    pattern = TclGetString(patternPtr);
-	    if (Tcl_GetIndexFromObj(interp, objv[3], options, "option", 0,
-		    &mode) != TCL_OK) {
+	    if (Tcl_GetIndexFromObjStruct(interp, objv[3], options,
+		    sizeof(char *), "option", 0, &mode) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	} else {
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 116bffb..6d0d2e2 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -84,8 +84,7 @@ Pkgb_UnsafeObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *CONST objv[])	/* Argument objects. */
 {
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
-    return TCL_OK;
+    return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
 }
 
 /*
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 0bcefa0..4e66d3b 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -15,16 +15,6 @@
 #include <ddeml.h>
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the Dde_Init
- * declaration is in the source file itself, which is only accessed when we
- * are building a library. DO NOT MOVE BEFORE ANY #include LINES. ONLY USE
- * EXTERN TO INDICATE EXPORTED FUNCTIONS FROM NOW ON.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * The following structure is used to keep track of the interpreters
  * registered by this process.
  */
@@ -116,8 +106,8 @@ static int		DdeObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 
-EXTERN int		Dde_Init(Tcl_Interp *interp);
-EXTERN int		Dde_SafeInit(Tcl_Interp *interp);
+DLLEXPORT int	Dde_Init(Tcl_Interp *interp);
+DLLEXPORT int	Dde_SafeInit(Tcl_Interp *interp);
 
 /*
  *----------------------------------------------------------------------
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index be884e1..e0f588c 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -20,15 +20,6 @@
 #include <stdlib.h>
 
 /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the
- * Registry_Init declaration is in the source file itself, which is only
- * accessed when we are building a library.
- */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-
-/*
  * The maximum length of a sub-key name.
  */
 
@@ -193,8 +184,8 @@ static int		SetValue(Tcl_Interp *interp, Tcl_Obj *keyNameObj,
 			    Tcl_Obj *valueNameObj, Tcl_Obj *dataObj,
 			    Tcl_Obj *typeObj);
 
-EXTERN int		Registry_Init(Tcl_Interp *interp);
-EXTERN int		Registry_Unload(Tcl_Interp *interp, int flags);
+DLLEXPORT int	Registry_Init(Tcl_Interp *interp);
+DLLEXPORT int	Registry_Unload(Tcl_Interp *interp, int flags);
 
 /*
  *----------------------------------------------------------------------
@@ -1151,8 +1142,8 @@ ParseKeyName(
      */
 
     rootObj = Tcl_NewStringObj(rootName, -1);
-    result = Tcl_GetIndexFromObj(interp, rootObj, rootKeyNames, "root name",
-	    TCL_EXACT, &index);
+    result = Tcl_GetIndexFromObjStruct(interp, rootObj, rootKeyNames,
+	    sizeof(char *), "root name", TCL_EXACT, &index);
     Tcl_DecrRefCount(rootObj);
     if (result != TCL_OK) {
 	return TCL_ERROR;
@@ -1262,8 +1253,8 @@ SetValue(
 
     if (typeObj == NULL) {
 	type = REG_SZ;
-    } else if (Tcl_GetIndexFromObj(interp, typeObj, typeNames, "type",
-	    0, (int *) &type) != TCL_OK) {
+    } else if (Tcl_GetIndexFromObjStruct(interp, typeObj, typeNames,
+	    sizeof(char *), "type", 0, (int *) &type) != TCL_OK) {
 	if (Tcl_GetIntFromObj(NULL, typeObj, (int*) &type) != TCL_OK) {
 	    return TCL_ERROR;
 	}