diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-17 07:57:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-03-17 07:57:14 (GMT) |
| commit | 9c8a1292c0c8aba0cd2c718d12e953c86af6cd7d (patch) | |
| tree | 60054fbc0be8daefb57f49eb6dc19903d00262fd | |
| parent | 1a6f1d5c40570e83189a91e4301d9e89369ce00e (diff) | |
| download | tcl-9c8a1292c0c8aba0cd2c718d12e953c86af6cd7d.zip tcl-9c8a1292c0c8aba0cd2c718d12e953c86af6cd7d.tar.gz tcl-9c8a1292c0c8aba0cd2c718d12e953c86af6cd7d.tar.bz2 | |
Don't introduce size_t in a header-file which didn't use it before. Make more clear that those are unsupported internal functions.
| -rw-r--r-- | generic/tcl.decls | 13 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 14 |
3 files changed, 20 insertions, 19 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls index 7f734c6..b50f775 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2326,24 +2326,23 @@ declare 630 { # ----- BASELINE -- FOR -- 8.6.0 ----- # -# TIP #481 (undocumented stub entries) +# (unsupported in Tcl 8.6) declare 651 { - char *TclGetStringFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr) + char *TclGetStringFromObj_(Tcl_Obj *objPtr, void *lengthPtr) } declare 652 { - unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, size_t *lengthPtr) + unsigned short *TclGetUnicodeFromObj_(Tcl_Obj *objPtr, void *lengthPtr) } -# Only available in Tcl 8.x, NULL in Tcl 9.0 declare 653 { - unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, size_t *numBytesPtr) + unsigned char *TclGetByteArrayFromObj_(Tcl_Obj *objPtr, void *numBytesPtr) } +# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # + declare 687 { void TclUnusedStubEntry(void) } -# ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # - ############################################################################## # Define the platform specific public Tcl interface. These functions are only diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 551a5b6..078974c 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1837,13 +1837,13 @@ EXTERN void Tcl_ZlibStreamSetCompressionDictionary( /* Slot 650 is reserved */ /* 651 */ EXTERN char * TclGetStringFromObj_(Tcl_Obj *objPtr, - size_t *lengthPtr); + void *lengthPtr); /* 652 */ EXTERN unsigned short * TclGetUnicodeFromObj_(Tcl_Obj *objPtr, - size_t *lengthPtr); + void *lengthPtr); /* 653 */ EXTERN unsigned char * TclGetByteArrayFromObj_(Tcl_Obj *objPtr, - size_t *numBytesPtr); + void *numBytesPtr); /* Slot 654 is reserved */ /* Slot 655 is reserved */ /* Slot 656 is reserved */ @@ -2565,9 +2565,9 @@ typedef struct TclStubs { void (*reserved648)(void); void (*reserved649)(void); void (*reserved650)(void); - char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 651 */ - unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, size_t *lengthPtr); /* 652 */ - unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, size_t *numBytesPtr); /* 653 */ + char * (*tclGetStringFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 651 */ + unsigned short * (*tclGetUnicodeFromObj_) (Tcl_Obj *objPtr, void *lengthPtr); /* 652 */ + unsigned char * (*tclGetByteArrayFromObj_) (Tcl_Obj *objPtr, void *numBytesPtr); /* 653 */ void (*reserved654)(void); void (*reserved655)(void); void (*reserved656)(void); diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 565dd8c..ff3a099 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -139,15 +139,17 @@ static const char *TclGetStartupScriptFileName(void) return Tcl_GetString(path); } +# (unsupported in Tcl 8.6) + #define TclGetStringFromObj_ getStringFromObj static char * TclGetStringFromObj_( Tcl_Obj *objPtr, - size_t *lengthPtr) + void *lengthPtr) { int length; char *result = Tcl_GetStringFromObj(objPtr, &length); - *lengthPtr = (size_t)length; + *(size_t *)lengthPtr = (size_t)length; return result; } @@ -155,11 +157,11 @@ TclGetStringFromObj_( static unsigned short * TclGetUnicodeFromObj_( Tcl_Obj *objPtr, - size_t *lengthPtr) + void *lengthPtr) { int length; Tcl_UniChar *result = Tcl_GetUnicodeFromObj(objPtr, &length); - *lengthPtr = (size_t)length; + *(size_t *)lengthPtr = (size_t)length; return result; } @@ -167,11 +169,11 @@ TclGetUnicodeFromObj_( static unsigned char * TclGetByteArrayFromObj_( Tcl_Obj *objPtr, - size_t *numBytesPtr) + void *numBytesPtr) { int numBytes; unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &numBytes); - *numBytesPtr = (size_t)numBytes; + *(size_t *)numBytesPtr = (size_t)numBytes; return result; } |