diff options
| -rw-r--r-- | .fossil-settings/ignore-glob | 4 | ||||
| -rwxr-xr-x | .gitignore | 4 | ||||
| -rw-r--r-- | .travis.yml | 42 | ||||
| -rw-r--r-- | doc/ParseArgs.3 | 2 | ||||
| -rw-r--r-- | generic/tcl.decls | 4 | ||||
| -rw-r--r-- | generic/tclDecls.h | 58 | ||||
| -rw-r--r-- | generic/tclInt.decls | 3 | ||||
| -rw-r--r-- | generic/tclIntDecls.h | 8 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 21 |
9 files changed, 105 insertions, 41 deletions
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob index 99fd07e..62a7a5a 100644 --- a/.fossil-settings/ignore-glob +++ b/.fossil-settings/ignore-glob @@ -19,6 +19,8 @@ */tcltest* */versions.vc */version.vc +*/libtcl.vfs +*/libtcl_*.zip html libtommath/bn.ilg libtommath/bn.ind @@ -45,6 +47,8 @@ unix/tclIndex unix/pkgs/* win/Debug* win/Release* +win/*.manifest win/pkgs/* +win/coffbase.txt win/tcl.hpj win/nmhlp-out.txt @@ -19,6 +19,8 @@ */tcltest* */versions.vc */version.vc +*/libtcl.vfs +*/libtcl_*.zip html libtommath/bn.ilg libtommath/bn.ind @@ -45,6 +47,8 @@ unix/tclIndex unix/pkgs/* win/Debug* win/Release* +win/*.manifest win/pkgs/* +win/coffbase.txt win/tcl.hpj win/nmhlp-out.txt diff --git a/.travis.yml b/.travis.yml index 151d281..e0eeed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -137,14 +137,13 @@ matrix: os: linux dist: xenial compiler: x86_64-w64-mingw32-gcc - addons: &mingw64 + addons: apt: packages: - gcc-mingw-w64-base - binutils-mingw-w64-x86-64 - gcc-mingw-w64-x86-64 - gcc-mingw-w64 - - wine env: - BUILD_DIR=win - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit" @@ -153,31 +152,13 @@ matrix: # Include a high visibility marker that tests are skipped outright - > echo "`tput setaf 3`SKIPPED TEST: CROSS COMPILING`tput sgr0`" - - name: "Linux-cross-Windows/GCC/Static/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows/GCC/Debug/no test" - os: linux - dist: xenial - compiler: x86_64-w64-mingw32-gcc - addons: *mingw64 - env: - - BUILD_DIR=win - - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-symbols" - script: *crosstest # Test with mingw-w64 (32 bit) cross-compile # Doesn't run tests because wine is only an imperfect Windows emulation - name: "Linux-cross-Windows-32/GCC/Shared/no test" os: linux dist: xenial compiler: i686-w64-mingw32-gcc - addons: &mingw32 + addons: apt: packages: - gcc-mingw-w64-base @@ -185,29 +166,10 @@ matrix: - gcc-mingw-w64-i686 - gcc-mingw-w64 - gcc-multilib - - wine env: - BUILD_DIR=win - CFGOPT="--host=i686-w64-mingw32" script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Static/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --disable-shared" - script: *crosstest - - name: "Linux-cross-Windows-32/GCC/Debug/no test" - os: linux - dist: xenial - compiler: i686-w64-mingw32-gcc - addons: *mingw32 - env: - - BUILD_DIR=win - - CFGOPT="--host=i686-w64-mingw32 --enable-symbols" - script: *crosstest # Test on Windows with MSVC native - name: "Windows/MSVC/Shared" os: windows diff --git a/doc/ParseArgs.3 b/doc/ParseArgs.3 index c254148..def55de 100644 --- a/doc/ParseArgs.3 +++ b/doc/ParseArgs.3 @@ -103,7 +103,7 @@ the argument's value. The following values are acceptable values for \fBTCL_ARGV_CONSTANT\fR . The argument does not take any following value argument. If this argument is -present, the \fIsrcPtr\fR field (casted to \fIint\fR) is copied to the variable +present, the (integer) value of the \fIsrcPtr\fR field is copied to the variable pointed to by the \fIdstPtr\fR field. The \fIclientData\fR field is ignored. .TP \fBTCL_ARGV_END\fR diff --git a/generic/tcl.decls b/generic/tcl.decls index b62cd28..c2a9c89 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2323,6 +2323,10 @@ declare 630 { Tcl_Obj *compressionDictionaryObj) } +declare 648 { + void TclUnusedStubEntry(void) +} + # ----- BASELINE -- FOR -- 8.6.0 ----- # ############################################################################## diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 3de71af..719cdf3 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1816,6 +1816,25 @@ EXTERN int Tcl_FSUnloadFile(Tcl_Interp *interp, EXTERN void Tcl_ZlibStreamSetCompressionDictionary( Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); +/* Slot 631 is reserved */ +/* Slot 632 is reserved */ +/* Slot 633 is reserved */ +/* Slot 634 is reserved */ +/* Slot 635 is reserved */ +/* Slot 636 is reserved */ +/* Slot 637 is reserved */ +/* Slot 638 is reserved */ +/* Slot 639 is reserved */ +/* Slot 640 is reserved */ +/* Slot 641 is reserved */ +/* Slot 642 is reserved */ +/* Slot 643 is reserved */ +/* Slot 644 is reserved */ +/* Slot 645 is reserved */ +/* Slot 646 is reserved */ +/* Slot 647 is reserved */ +/* 648 */ +EXTERN void TclUnusedStubEntry(void); typedef struct { const struct TclPlatStubs *tclPlatStubs; @@ -2482,6 +2501,24 @@ typedef struct TclStubs { void * (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */ int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */ void (*tcl_ZlibStreamSetCompressionDictionary) (Tcl_ZlibStream zhandle, Tcl_Obj *compressionDictionaryObj); /* 630 */ + void (*reserved631)(void); + void (*reserved632)(void); + void (*reserved633)(void); + void (*reserved634)(void); + void (*reserved635)(void); + void (*reserved636)(void); + void (*reserved637)(void); + void (*reserved638)(void); + void (*reserved639)(void); + void (*reserved640)(void); + void (*reserved641)(void); + void (*reserved642)(void); + void (*reserved643)(void); + void (*reserved644)(void); + void (*reserved645)(void); + void (*reserved646)(void); + void (*reserved647)(void); + void (*tclUnusedStubEntry) (void); /* 648 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3774,11 +3811,32 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_FSUnloadFile) /* 629 */ #define Tcl_ZlibStreamSetCompressionDictionary \ (tclStubsPtr->tcl_ZlibStreamSetCompressionDictionary) /* 630 */ +/* Slot 631 is reserved */ +/* Slot 632 is reserved */ +/* Slot 633 is reserved */ +/* Slot 634 is reserved */ +/* Slot 635 is reserved */ +/* Slot 636 is reserved */ +/* Slot 637 is reserved */ +/* Slot 638 is reserved */ +/* Slot 639 is reserved */ +/* Slot 640 is reserved */ +/* Slot 641 is reserved */ +/* Slot 642 is reserved */ +/* Slot 643 is reserved */ +/* Slot 644 is reserved */ +/* Slot 645 is reserved */ +/* Slot 646 is reserved */ +/* Slot 647 is reserved */ +#define TclUnusedStubEntry \ + (tclStubsPtr->tclUnusedStubEntry) /* 648 */ #endif /* defined(USE_TCL_STUBS) */ /* !END!: Do not edit above this line. */ +#undef TclUnusedStubEntry + #if defined(USE_TCL_STUBS) # undef Tcl_CreateInterp # undef Tcl_FindExecutable diff --git a/generic/tclInt.decls b/generic/tclInt.decls index e9af34a..2739122 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -1037,6 +1037,9 @@ declare 256 { int TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags) } +declare 258 { + void TclUnusedStubEntry(void) +} ############################################################################## diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 1991c21..4039e9f 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -638,6 +638,9 @@ EXTERN int TclPtrObjMakeUpvar(Tcl_Interp *interp, EXTERN int TclPtrUnsetVar(Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); +/* Slot 257 is reserved */ +/* 258 */ +EXTERN void TclUnusedStubEntry(void); typedef struct TclIntStubs { int magic; @@ -900,6 +903,8 @@ typedef struct TclIntStubs { Tcl_Obj * (*tclPtrIncrObjVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, Tcl_Obj *incrPtr, const int flags); /* 254 */ int (*tclPtrObjMakeUpvar) (Tcl_Interp *interp, Tcl_Var otherPtr, Tcl_Obj *myNamePtr, int myFlags); /* 255 */ int (*tclPtrUnsetVar) (Tcl_Interp *interp, Tcl_Var varPtr, Tcl_Var arrayPtr, Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, const int flags); /* 256 */ + void (*reserved257)(void); + void (*tclUnusedStubEntry) (void); /* 258 */ } TclIntStubs; extern const TclIntStubs *tclIntStubsPtr; @@ -1341,6 +1346,9 @@ extern const TclIntStubs *tclIntStubsPtr; (tclIntStubsPtr->tclPtrObjMakeUpvar) /* 255 */ #define TclPtrUnsetVar \ (tclIntStubsPtr->tclPtrUnsetVar) /* 256 */ +/* Slot 257 is reserved */ +#define TclUnusedStubEntry \ + (tclIntStubsPtr->tclUnusedStubEntry) /* 258 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index bf05158..30fa411 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -57,6 +57,7 @@ #define TclBN_mp_tc_and TclBN_mp_and #define TclBN_mp_tc_or TclBN_mp_or #define TclBN_mp_tc_xor TclBN_mp_xor +#define TclUnusedStubEntry NULL /* See bug 510001: TclSockMinimumBuffers needs plat imp */ #ifdef _WIN64 @@ -670,6 +671,8 @@ static const TclIntStubs tclIntStubs = { TclPtrIncrObjVar, /* 254 */ TclPtrObjMakeUpvar, /* 255 */ TclPtrUnsetVar, /* 256 */ + 0, /* 257 */ + TclUnusedStubEntry, /* 258 */ }; static const TclIntPlatStubs tclIntPlatStubs = { @@ -1536,6 +1539,24 @@ const TclStubs tclStubs = { Tcl_FindSymbol, /* 628 */ Tcl_FSUnloadFile, /* 629 */ Tcl_ZlibStreamSetCompressionDictionary, /* 630 */ + 0, /* 631 */ + 0, /* 632 */ + 0, /* 633 */ + 0, /* 634 */ + 0, /* 635 */ + 0, /* 636 */ + 0, /* 637 */ + 0, /* 638 */ + 0, /* 639 */ + 0, /* 640 */ + 0, /* 641 */ + 0, /* 642 */ + 0, /* 643 */ + 0, /* 644 */ + 0, /* 645 */ + 0, /* 646 */ + 0, /* 647 */ + TclUnusedStubEntry, /* 648 */ }; /* !END!: Do not edit above this line. */ |