diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-12-20 09:36:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-12-20 09:36:50 (GMT) |
| commit | b258cc76aba7c7cb1906d863944bb4cd6ea5d1a4 (patch) | |
| tree | 9fdbe37405ebe23e1d7e77f2455ac88ab2096bc7 /generic | |
| parent | 43b22f924faa4963e0238f2191f56270c8d90b81 (diff) | |
| download | tcl-b258cc76aba7c7cb1906d863944bb4cd6ea5d1a4.zip tcl-b258cc76aba7c7cb1906d863944bb4cd6ea5d1a4.tar.gz tcl-b258cc76aba7c7cb1906d863944bb4cd6ea5d1a4.tar.bz2 | |
Record the fact that all stub-enabled extensions work in Tcl 8.5+, no 8.6 (or 9.0) features are needed. (Differences between 8.x and 9.0 are handled by a different stub magic value)
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclStubLib.c | 14 | ||||
| -rw-r--r-- | generic/tclTest.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index a8c68a6..d1bf47f 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2410,10 +2410,6 @@ const char * TclTomMathInitializeStubs(Tcl_Interp *interp, #endif /* - * TODO - tommath stubs export goes here! - */ - -/* * Public functions that are not accessible via the stubs table. * Tcl_GetMemoryInfo is needed for AOLserver. [Bug 1868171] */ diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c index afabdca..dd951bf 100644 --- a/generic/tclStubLib.c +++ b/generic/tclStubLib.c @@ -101,12 +101,16 @@ Tcl_InitStubs( } } } - tclStubsPtr = (TclStubs *)pkgData; + if (((exact&0xff00) < 0x900)) { + /* We are running Tcl 8.x */ + stubsPtr = (TclStubs *)pkgData; + } + tclStubsPtr = stubsPtr; - if (tclStubsPtr->hooks) { - tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs; - tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs; - tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs; + if (stubsPtr->hooks) { + tclPlatStubsPtr = stubsPtr->hooks->tclPlatStubs; + tclIntStubsPtr = stubsPtr->hooks->tclIntStubs; + tclIntPlatStubsPtr = stubsPtr->hooks->tclIntPlatStubs; } else { tclPlatStubsPtr = NULL; tclIntStubsPtr = NULL; diff --git a/generic/tclTest.c b/generic/tclTest.c index dee1fe7..56878e9 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -544,10 +544,10 @@ Tcltest_Init( "-appinitprocclosestderr", "-appinitprocsetrcfile", NULL }; - if (Tcl_InitStubs(interp, "8.5", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) { return TCL_ERROR; } - if (Tcl_TomMath_InitStubs(interp, "8.5") == NULL) { + if (Tcl_TomMath_InitStubs(interp, "8.5-") == NULL) { return TCL_ERROR; } if (Tcl_OOInitStubs(interp) == NULL) { @@ -786,7 +786,7 @@ int Tcltest_SafeInit( Tcl_Interp *interp) /* Interpreter for application. */ { - if (Tcl_InitStubs(interp, "8.5", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) { return TCL_ERROR; } return Procbodytest_SafeInit(interp); @@ -4639,7 +4639,7 @@ TestpanicCmd( int argc, /* Number of arguments. */ const char **argv) /* Argument strings. */ { - const char *argString; + char *argString; /* * Put the arguments into a var args structure |