diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-16 09:17:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-16 09:17:25 (GMT) |
| commit | 3db744b60506ba65731f996d7e3dc5224d232bc9 (patch) | |
| tree | 274545e9246a2a642e1ceca8183e2f171205c59c /generic | |
| parent | 2a95f6b4192876906ced706fcdf40926f6a7eab7 (diff) | |
| parent | 096fcb63ad03e22727db52eba9d7926194f673ae (diff) | |
| download | tcl-3db744b60506ba65731f996d7e3dc5224d232bc9.zip tcl-3db744b60506ba65731f996d7e3dc5224d232bc9.tar.gz tcl-3db744b60506ba65731f996d7e3dc5224d232bc9.tar.bz2 | |
Allow win32 build with -DTCL_NO_DEPRECATED, just as the UNIX build, off by default.
Define Tcl_EvalObj and Tcl_GlobalEvalObj as macros, even when TCL_NO_DEPRECATED is defined, so Tk can benefit from it too (this is not what TCL_NO_DEPRECATED is supposed to do).
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 11 | ||||
| -rw-r--r-- | generic/tclBasic.c | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 |
3 files changed, 12 insertions, 13 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 145124c..33730d4 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2407,17 +2407,6 @@ EXTERN void Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr)); #ifndef TCL_NO_DEPRECATED /* - * Deprecated Tcl functions: - */ - -# 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) - - /* * These function have been renamed. The old names are deprecated, but we * define these macros for backwards compatibilty. */ diff --git a/generic/tclBasic.c b/generic/tclBasic.c index cfb5c43..5779ca5 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -4990,7 +4990,6 @@ Tcl_Eval( *---------------------------------------------------------------------- */ -#undef Tcl_EvalObj int Tcl_EvalObj( Tcl_Interp *interp, @@ -4999,7 +4998,6 @@ 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 8cb939c..20ec35d 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -6547,5 +6547,17 @@ extern TclStubs *tclStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +/* + * 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 + #endif /* _TCLDECLS */ |