summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-04 07:07:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-04 07:07:28 (GMT)
commitc70e635d90321aba50e235fa636bcf1f78dfeda5 (patch)
tree246f77dbef6234338add5e62443a52074c10480c
parent63dd224af5885144ab5a1de8919c5e8ea9d4b969 (diff)
parentac66ecde08cacbe613154be42c2bc55c2a513435 (diff)
downloadtcl-c70e635d90321aba50e235fa636bcf1f78dfeda5.zip
tcl-c70e635d90321aba50e235fa636bcf1f78dfeda5.tar.gz
tcl-c70e635d90321aba50e235fa636bcf1f78dfeda5.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 64a4d3a..cde1cb9 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -5847,6 +5847,7 @@ Tcl_Eval(
*----------------------------------------------------------------------
*/
+#undef Tcl_EvalObj
int
Tcl_EvalObj(
Tcl_Interp *interp,
@@ -5854,6 +5855,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 04a735a..a1c0bf4 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -3812,13 +3812,11 @@ extern const 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 */