summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-09 10:10:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-04-09 10:10:34 (GMT)
commitf972f068721fbbaf540643697fe68046d607baaf (patch)
tree380dd687f9dc15c475a6e55a784e88b0c59b6308
parent7ff52157edb4f8563b115be8ef48d116e3730e0d (diff)
downloadtcl-f972f068721fbbaf540643697fe68046d607baaf.zip
tcl-f972f068721fbbaf540643697fe68046d607baaf.tar.gz
tcl-f972f068721fbbaf540643697fe68046d607baaf.tar.bz2
Make (deprecated) Tcl_EvalObj/Tcl_GlobalEvalObj macro's 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 134deac..bd4ad5d 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4923,6 +4923,7 @@ Tcl_Eval(interp, string)
*----------------------------------------------------------------------
*/
+#undef Tcl_EvalObj
int
Tcl_EvalObj(interp, objPtr)
Tcl_Interp * interp;
@@ -4931,6 +4932,7 @@ Tcl_EvalObj(interp, objPtr)
return Tcl_EvalObjEx(interp, objPtr, 0);
}
+#undef Tcl_GlobalEvalObj
int
Tcl_GlobalEvalObj(interp, objPtr)
Tcl_Interp * interp;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 8d9f635..618536d 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4519,14 +4519,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 */