summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclIOGT.c4
-rw-r--r--generic/tclPkg.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclIOGT.c b/generic/tclIOGT.c
index bd01d8c..901ced5 100644
--- a/generic/tclIOGT.c
+++ b/generic/tclIOGT.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * CVS: $Id: tclIOGT.c,v 1.15 2006/03/27 18:08:50 andreas_kupries Exp $
+ * CVS: $Id: tclIOGT.c,v 1.16 2006/08/30 17:59:03 hobbs Exp $
*/
#include "tclInt.h"
@@ -406,7 +406,7 @@ ExecuteCallback(
* current interpreter. Don't copy if in preservation mode.
*/
- res = Tcl_GlobalEvalObj(dataPtr->interp, command);
+ res = Tcl_EvalObjEx(dataPtr->interp, command, TCL_EVAL_GLOBAL);
Tcl_DecrRefCount(command);
command = NULL;
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index f92bd18..9a990a2 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPkg.c,v 1.14 2005/11/08 18:26:59 dgp Exp $
+ * RCS: @(#) $Id: tclPkg.c,v 1.15 2006/08/30 17:59:03 hobbs Exp $
*/
#include "tclInt.h"
@@ -313,7 +313,7 @@ Tcl_PkgRequireEx(
pkgPtr->clientData = (ClientData) versionToProvide;
Tcl_Preserve((ClientData) script);
Tcl_Preserve((ClientData) versionToProvide);
- code = Tcl_GlobalEval(interp, script);
+ code = Tcl_EvalEx(interp, script, -1, TCL_EVAL_GLOBAL);
Tcl_Release((ClientData) script);
pkgPtr = FindPackage(interp, name);
@@ -392,7 +392,8 @@ Tcl_PkgRequireEx(
if (exact) {
Tcl_DStringAppend(&command, " -exact", 7);
}
- code = Tcl_GlobalEval(interp, Tcl_DStringValue(&command));
+ code = Tcl_EvalEx(interp, Tcl_DStringValue(&command),
+ Tcl_DStringLength(&command), TCL_EVAL_GLOBAL);
Tcl_DStringFree(&command);
if ((code != TCL_OK) && (code != TCL_ERROR)) {