summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-04 07:03:05 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-04 07:03:05 (GMT)
commitac66ecde08cacbe613154be42c2bc55c2a513435 (patch)
tree4f5dc06707a6d44ad29d8f6e5bbd5055d9ab0f7f
parentd7d1390430a8a37725faebeeab0bb5fc7e58c833 (diff)
downloadtcl-ac66ecde08cacbe613154be42c2bc55c2a513435.zip
tcl-ac66ecde08cacbe613154be42c2bc55c2a513435.tar.gz
tcl-ac66ecde08cacbe613154be42c2bc55c2a513435.tar.bz2
Make Tcl_EvalObj/Tcl_GlobalEvalObj a macro always, not only when using stubs.
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclDecls.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 5779ca5..cfb5c43 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4990,6 +4990,7 @@ Tcl_Eval(
*----------------------------------------------------------------------
*/
+#undef Tcl_EvalObj
int
Tcl_EvalObj(
Tcl_Interp *interp,
@@ -4998,6 +4999,7 @@ Tcl_EvalObj(
return Tcl_EvalObjEx(interp, objPtr, 0);
}
+#undef Tcl_GlobalEvalObj
int
Tcl_GlobalEvalObj(
Tcl_Interp *interp,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 20ec35d..456337a 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -6550,14 +6550,12 @@ extern TclStubs *tclStubsPtr;
/*
* Deprecated Tcl procedures:
*/
-#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
-# undef Tcl_EvalObj
-# define Tcl_EvalObj(interp,objPtr) \
- Tcl_EvalObjEx((interp),(objPtr),0)
-# undef Tcl_GlobalEvalObj
-# define Tcl_GlobalEvalObj(interp,objPtr) \
- Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
-#endif
+#undef Tcl_EvalObj
+#define Tcl_EvalObj(interp,objPtr) \
+ Tcl_EvalObjEx((interp),(objPtr),0)
+#undef Tcl_GlobalEvalObj
+#define Tcl_GlobalEvalObj(interp,objPtr) \
+ Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL)
#endif /* _TCLDECLS */