diff options
| -rw-r--r-- | generic/tcl.decls | 6 | ||||
| -rw-r--r-- | generic/tclDecls.h | 27 | ||||
| -rw-r--r-- | generic/tclInt.decls | 1 | ||||
| -rw-r--r-- | generic/tclIntDecls.h | 1 | ||||
| -rw-r--r-- | generic/tclPlatDecls.h | 6 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 10 | ||||
| -rw-r--r-- | generic/tclTomMath.decls | 1 | ||||
| -rw-r--r-- | tools/genStubs.tcl | 2 |
8 files changed, 47 insertions, 7 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 13e7326..6583aff 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2325,7 +2325,7 @@ declare 630 { # ----- BASELINE -- FOR -- 8.6.0 ----- # -declare 649 { +declare 656 { void TclUnusedStubEntry(void) } @@ -2365,6 +2365,9 @@ declare 1 macosx { const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath) } +declare 2 macosx { + void TclUnusedStubEntry(void) +} ############################################################################## @@ -2393,6 +2396,7 @@ export { void Tcl_GetMemoryInfo(Tcl_DString *dsPtr) } + # Local Variables: # mode: tcl # End: diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 0f18dd4..89c2808 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1833,7 +1833,14 @@ EXTERN void Tcl_ZlibStreamSetCompressionDictionary( /* Slot 646 is reserved */ /* Slot 647 is reserved */ /* Slot 648 is reserved */ -/* 649 */ +/* Slot 649 is reserved */ +/* Slot 650 is reserved */ +/* Slot 651 is reserved */ +/* Slot 652 is reserved */ +/* Slot 653 is reserved */ +/* Slot 654 is reserved */ +/* Slot 655 is reserved */ +/* 656 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2519,7 +2526,14 @@ typedef struct TclStubs { void (*reserved646)(void); void (*reserved647)(void); void (*reserved648)(void); - void (*tclUnusedStubEntry) (void); /* 649 */ + void (*reserved649)(void); + void (*reserved650)(void); + void (*reserved651)(void); + void (*reserved652)(void); + void (*reserved653)(void); + void (*reserved654)(void); + void (*reserved655)(void); + void (*tclUnusedStubEntry) (void); /* 656 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3830,8 +3844,15 @@ extern const TclStubs *tclStubsPtr; /* Slot 646 is reserved */ /* Slot 647 is reserved */ /* Slot 648 is reserved */ +/* Slot 649 is reserved */ +/* Slot 650 is reserved */ +/* Slot 651 is reserved */ +/* Slot 652 is reserved */ +/* Slot 653 is reserved */ +/* Slot 654 is reserved */ +/* Slot 655 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 649 */ + (tclStubsPtr->tclUnusedStubEntry) /* 656 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclInt.decls b/generic/tclInt.decls index b6f7b75..3c3b50a 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -17,6 +17,7 @@ library tcl # Define the unsupported generic interfaces. interface tclInt +scspec EXTERN # Declare each of the functions in the unsupported internal Tcl # interface. These interfaces are allowed to changed between versions. diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index ffe0e17..b7ac0e7 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -1373,6 +1373,7 @@ extern const TclIntStubs *tclIntStubsPtr; #undef TclGetStartupScriptPath #undef TclSetStartupScriptPath #undef TclBackgroundException +#undef TclUnusedStubEntry #if defined(USE_TCL_STUBS) && defined(TCL_NO_DEPRECATED) # undef Tcl_SetStartupScript diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 974bafa..08af423 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -69,6 +69,8 @@ EXTERN int Tcl_MacOSXOpenVersionedBundleResources( const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); +/* 2 */ +EXTERN void TclUnusedStubEntry(void); #endif /* MACOSX */ typedef struct TclPlatStubs { @@ -82,6 +84,7 @@ typedef struct TclPlatStubs { #ifdef MAC_OSX_TCL /* MACOSX */ int (*tcl_MacOSXOpenBundleResources) (Tcl_Interp *interp, const char *bundleName, int hasResourceFile, int maxPathLen, char *libraryPath); /* 0 */ int (*tcl_MacOSXOpenVersionedBundleResources) (Tcl_Interp *interp, const char *bundleName, const char *bundleVersion, int hasResourceFile, int maxPathLen, char *libraryPath); /* 1 */ + void (*tclUnusedStubEntry) (void); /* 2 */ #endif /* MACOSX */ } TclPlatStubs; @@ -108,12 +111,15 @@ extern const TclPlatStubs *tclPlatStubsPtr; (tclPlatStubsPtr->tcl_MacOSXOpenBundleResources) /* 0 */ #define Tcl_MacOSXOpenVersionedBundleResources \ (tclPlatStubsPtr->tcl_MacOSXOpenVersionedBundleResources) /* 1 */ +#define TclUnusedStubEntry \ + (tclPlatStubsPtr->tclUnusedStubEntry) /* 2 */ #endif /* MACOSX */ #endif /* defined(USE_TCL_STUBS) */ /* !END!: Do not edit above this line. */ +#undef TclUnusedStubEntry #ifdef MAC_OSX_TCL /* MACOSX */ #undef Tcl_MacOSXOpenBundleResources #define Tcl_MacOSXOpenBundleResources(a,b,c,d,e) Tcl_MacOSXOpenVersionedBundleResources(a,b,NULL,c,d,e) diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index f05db0a..3c734ce 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -866,6 +866,7 @@ static const TclPlatStubs tclPlatStubs = { #ifdef MAC_OSX_TCL /* MACOSX */ Tcl_MacOSXOpenBundleResources, /* 0 */ Tcl_MacOSXOpenVersionedBundleResources, /* 1 */ + TclUnusedStubEntry, /* 2 */ #endif /* MACOSX */ }; @@ -1637,7 +1638,14 @@ const TclStubs tclStubs = { 0, /* 646 */ 0, /* 647 */ 0, /* 648 */ - TclUnusedStubEntry, /* 649 */ + 0, /* 649 */ + 0, /* 650 */ + 0, /* 651 */ + 0, /* 652 */ + 0, /* 653 */ + 0, /* 654 */ + 0, /* 655 */ + TclUnusedStubEntry, /* 656 */ }; /* !END!: Do not edit above this line. */ diff --git a/generic/tclTomMath.decls b/generic/tclTomMath.decls index 02d3581..0aa9a42 100644 --- a/generic/tclTomMath.decls +++ b/generic/tclTomMath.decls @@ -17,7 +17,6 @@ library tcl # Define the unsupported generic interfaces. interface tclTomMath -# hooks {tclTomMathInt} scspec EXTERN # Declare each of the functions in the Tcl tommath interface diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index 47b8ad4..4f4acbb 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -1214,7 +1214,7 @@ proc genStubs::init {} { # Results: # Returns any values that were not assigned to variables. -if {[string length [namespace which lassign]] == 0} { +if {[namespace which lassign] ne ""} { proc lassign {valueList args} { if {[llength $args] == 0} { error "wrong # args: should be \"lassign list varName ?varName ...?\"" |