diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 13:23:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 13:23:48 (GMT) |
| commit | 4d2fcb079c56da7c513957ac4935b19846434936 (patch) | |
| tree | c46d004d0abf0953e188aada30d68d5972d49cef /generic | |
| parent | c0685465eeeaf12a1b44612577716d5ea346c2f2 (diff) | |
| parent | 980f440595704140c6c53de68b562b0cf414e954 (diff) | |
| download | tcl-4d2fcb079c56da7c513957ac4935b19846434936.zip tcl-4d2fcb079c56da7c513957ac4935b19846434936.tar.gz tcl-4d2fcb079c56da7c513957ac4935b19846434936.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclIO.c | 9 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 3048f97..641d2b1 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2366,7 +2366,7 @@ declare 687 { # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # -declare 688 { +declare 690 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index cdfe075..d4fee5e 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1867,7 +1867,9 @@ EXTERN int Tcl_UtfNcmp(const char *s1, const char *s2, size_t n); /* 687 */ EXTERN int Tcl_UtfNcasecmp(const char *s1, const char *s2, size_t n); -/* 688 */ +/* Slot 688 is reserved */ +/* Slot 689 is reserved */ +/* 690 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2568,7 +2570,9 @@ typedef struct TclStubs { Tcl_Obj * (*tcl_DStringToObj) (Tcl_DString *dsPtr); /* 685 */ int (*tcl_UtfNcmp) (const char *s1, const char *s2, size_t n); /* 686 */ int (*tcl_UtfNcasecmp) (const char *s1, const char *s2, size_t n); /* 687 */ - void (*tclUnusedStubEntry) (void); /* 688 */ + void (*reserved688)(void); + void (*reserved689)(void); + void (*tclUnusedStubEntry) (void); /* 690 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3896,8 +3900,10 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_UtfNcmp) /* 686 */ #define Tcl_UtfNcasecmp \ (tclStubsPtr->tcl_UtfNcasecmp) /* 687 */ +/* Slot 688 is reserved */ +/* Slot 689 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 688 */ + (tclStubsPtr->tclUnusedStubEntry) /* 690 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclIO.c b/generic/tclIO.c index 4e053e1..78cda5c 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4975,8 +4975,7 @@ Tcl_GetsObj( done: assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -6098,8 +6097,7 @@ finish: */ assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -10240,8 +10238,7 @@ DoRead( } assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index f837e2c..fc0f6fa 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1491,7 +1491,9 @@ const TclStubs tclStubs = { Tcl_DStringToObj, /* 685 */ Tcl_UtfNcmp, /* 686 */ Tcl_UtfNcasecmp, /* 687 */ - TclUnusedStubEntry, /* 688 */ + 0, /* 688 */ + 0, /* 689 */ + TclUnusedStubEntry, /* 690 */ }; /* !END!: Do not edit above this line. */ |