diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-15 14:39:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-11-15 14:39:11 (GMT) |
| commit | b3caf035b4e0afcd1686d6ac3190f6e0970e8199 (patch) | |
| tree | e8693f4f4457d6df988e8bc4e53063841da7c4c5 | |
| parent | d13a3cd5020a792d88f940a51eb79639c12331c3 (diff) | |
| parent | 9d2a40a82608f1e3d87aac7de2190dfcd92470da (diff) | |
| download | tcl-b3caf035b4e0afcd1686d6ac3190f6e0970e8199.zip tcl-b3caf035b4e0afcd1686d6ac3190f6e0970e8199.tar.gz tcl-b3caf035b4e0afcd1686d6ac3190f6e0970e8199.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.decls | 14 | ||||
| -rw-r--r-- | generic/tclDecls.h | 9 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 3 |
3 files changed, 16 insertions, 10 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 2128880..d3df327 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2552,12 +2552,22 @@ declare 683 { int Tcl_GetEncodingNulLength(Tcl_Encoding encoding) } -declare 687 { +# TIP #648 (reserved) +#declare 684 { +# Tcl_Obj *Tcl_NewWideUIntObj(Tcl_WideUInt wideValue) +#} +#declare 685 { +# void Tcl_SetWideUIntObj(Tcl_Obj *objPtr, Tcl_WideUInt uwideValue) +#} + +# TIP #650 +declare 686 { int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr) } -# ----- BASELINE -- FOR -- 8.7.0 ----- # + +# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # ############################################################################## diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 9c70434..1bddb16 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -2042,8 +2042,7 @@ EXTERN int Tcl_RemoveChannelMode(Tcl_Interp *interp, EXTERN int Tcl_GetEncodingNulLength(Tcl_Encoding encoding); /* Slot 684 is reserved */ /* Slot 685 is reserved */ -/* Slot 686 is reserved */ -/* 687 */ +/* 686 */ EXTERN int Tcl_GetWideUIntFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); @@ -2767,8 +2766,7 @@ typedef struct TclStubs { int (*tcl_GetEncodingNulLength) (Tcl_Encoding encoding); /* 683 */ void (*reserved684)(void); void (*reserved685)(void); - void (*reserved686)(void); - int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 687 */ + int (*tcl_GetWideUIntFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_WideUInt *uwidePtr); /* 686 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -4169,9 +4167,8 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_GetEncodingNulLength) /* 683 */ /* Slot 684 is reserved */ /* Slot 685 is reserved */ -/* Slot 686 is reserved */ #define Tcl_GetWideUIntFromObj \ - (tclStubsPtr->tcl_GetWideUIntFromObj) /* 687 */ + (tclStubsPtr->tcl_GetWideUIntFromObj) /* 686 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index e3c519b..793aad3 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -2057,8 +2057,7 @@ const TclStubs tclStubs = { Tcl_GetEncodingNulLength, /* 683 */ 0, /* 684 */ 0, /* 685 */ - 0, /* 686 */ - Tcl_GetWideUIntFromObj, /* 687 */ + Tcl_GetWideUIntFromObj, /* 686 */ }; /* !END!: Do not edit above this line. */ |