Subject: Make (deprecated) Tcl_EvalObj/Tcl_GlobalEvalObj macro's always, not only when using stubs.

From: "jan.nijtmans" <[email-masked]>
Date: Tue, 9 Apr 2013 10:10:34 +0000

---
 generic/tclBasic.c |  2 ++
 generic/tclDecls.h | 14 ++++++--------
 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 */
 
-- 
cgit v0.12