diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-04 10:46:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-04 10:46:07 (GMT) |
| commit | 6f77d31f1bacd7f1f6fefce74af42b5101402b3a (patch) | |
| tree | f4a624db02046117713a194c8536fa8120637df8 /generic | |
| parent | e50a73c706a2531b02798ffbc55f8c7299063188 (diff) | |
| parent | 063e0061117b2034334ecc544f382dd39ad52fc7 (diff) | |
| download | tcl-6f77d31f1bacd7f1f6fefce74af42b5101402b3a.zip tcl-6f77d31f1bacd7f1f6fefce74af42b5101402b3a.tar.gz tcl-6f77d31f1bacd7f1f6fefce74af42b5101402b3a.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.decls | 3 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclInt.decls | 1 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 4 | ||||
| -rw-r--r-- | generic/tclTomMath.decls | 1 |
5 files changed, 20 insertions, 1 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 6a34a53..5b1c3d2 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2475,6 +2475,9 @@ declare 652 { declare 653 { unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, size_t *lengthPtr) } +declare 656 { + void TclUnusedStubEntry(void) +} # ----- BASELINE -- FOR -- 8.7.0 ----- # diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 776c6af..a1454a5 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1740,6 +1740,10 @@ EXTERN Tcl_UniChar * Tcl_GetUnicodeFromObj(Tcl_Obj *objPtr, /* 653 */ EXTERN unsigned char * Tcl_GetByteArrayFromObj(Tcl_Obj *objPtr, size_t *lengthPtr); +/* Slot 654 is reserved */ +/* Slot 655 is reserved */ +/* 656 */ +EXTERN void TclUnusedStubEntry(void); typedef struct { const struct TclPlatStubs *tclPlatStubs; @@ -2405,6 +2409,9 @@ typedef struct TclStubs { char * (*tcl_GetStringFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */ Tcl_UniChar * (*tcl_GetUnicodeFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */ unsigned char * (*tcl_GetByteArrayFromObj) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 653 */ + void (*reserved654)(void); + void (*reserved655)(void); + void (*tclUnusedStubEntry) (void); /* 656 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3661,11 +3668,16 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_GetUnicodeFromObj) /* 652 */ #define Tcl_GetByteArrayFromObj \ (tclStubsPtr->tcl_GetByteArrayFromObj) /* 653 */ +/* Slot 654 is reserved */ +/* Slot 655 is reserved */ +#define TclUnusedStubEntry \ + (tclStubsPtr->tclUnusedStubEntry) /* 656 */ #endif /* defined(USE_TCL_STUBS) */ /* !END!: Do not edit above this line. */ +#undef TclUnusedStubEntry #if defined(USE_TCL_STUBS) # undef Tcl_CreateInterp # undef Tcl_Init diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 3fbc571..d7ea540 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/tclStubInit.c b/generic/tclStubInit.c index 2248238..f6b8b0d 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -66,6 +66,7 @@ #undef Tcl_UniCharToUtfDString #undef Tcl_UtfToUniCharDString #undef Tcl_UtfToUniChar +#define TclUnusedStubEntry 0 #if TCL_UTF_MAX <= 3 static void uniCodePanic() { @@ -1414,6 +1415,9 @@ const TclStubs tclStubs = { Tcl_GetStringFromObj, /* 651 */ Tcl_GetUnicodeFromObj, /* 652 */ Tcl_GetByteArrayFromObj, /* 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 ea310e0..9c5ca8b 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 |