diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-09 15:56:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-09 15:56:04 (GMT) |
| commit | b7e5592df1f6b8d92935251cb1616e10b656ac07 (patch) | |
| tree | ef789fbc1392b7bd7609fa81b92986d2241be9d7 /generic/tcl.h | |
| parent | a037934e2165dc52888a2daa656c9e5d5ddc980e (diff) | |
| parent | 78374f18a4199081db4462452b16c3e4193edc92 (diff) | |
| download | tcl-b7e5592df1f6b8d92935251cb1616e10b656ac07.zip tcl-b7e5592df1f6b8d92935251cb1616e10b656ac07.tar.gz tcl-b7e5592df1f6b8d92935251cb1616e10b656ac07.tar.bz2 | |
Merge core-8-branch. Backout the Tcl_EvalFile changes.
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 54c6b73..23a0a9a 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2409,14 +2409,27 @@ const char * TclTomMathInitializeStubs(Tcl_Interp *interp, const char *version, int epoch, int revision); #ifdef USE_TCL_STUBS -#define Tcl_InitStubs(interp, version, exact) \ - (Tcl_InitStubs)(interp, version, \ +#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE +# define Tcl_InitStubs(interp, version, exact) \ + (Tcl_InitStubs)(interp, version, \ (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \ TCL_STUB_MAGIC) #else -#define Tcl_InitStubs(interp, version, exact) \ - Tcl_PkgInitStubsCheck(interp, version, \ - (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16)) +# define Tcl_InitStubs(interp, version, exact) \ + (Tcl_InitStubs)(interp, TCL_PATCH_LEVEL, \ + 1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16), \ + TCL_STUB_MAGIC) +#endif +#else +#if TCL_RELEASE_LEVEL == TCL_FINAL_RELEASE +# define Tcl_InitStubs(interp, version, exact) \ + Tcl_PkgInitStubsCheck(interp, version, \ + (exact)|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16)) +#else +# define Tcl_InitStubs(interp, version, exact) \ + Tcl_PkgInitStubsCheck(interp, TCL_PATCH_LEVEL, \ + 1|(TCL_MAJOR_VERSION<<8)|(TCL_MINOR_VERSION<<16)) +#endif #endif /* |