diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-13 17:30:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-13 17:30:21 (GMT) |
| commit | 6a2182cc0982e7877c5b7edca549c93035cbe03b (patch) | |
| tree | 0032bb3c7b8f3d93b7ae19f521fad9ffb1a20869 /generic/tclStubInit.c | |
| parent | f33ce355a444dcca2dc94f28935b93a8a6d389f4 (diff) | |
| parent | f203ef7d88a55f67da7ef2b7cfe869f2b9af78c9 (diff) | |
| download | tcl-6a2182cc0982e7877c5b7edca549c93035cbe03b.zip tcl-6a2182cc0982e7877c5b7edca549c93035cbe03b.tar.gz tcl-6a2182cc0982e7877c5b7edca549c93035cbe03b.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'generic/tclStubInit.c')
| -rw-r--r-- | generic/tclStubInit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index a4427b7..b6f8738 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -73,10 +73,8 @@ # undef Tcl_WinConvertError # define Tcl_WinConvertError 0 #endif +#undef TclGetStringFromObj #if defined(TCL_NO_DEPRECATED) -# undef TclGetStringFromObj -# undef TclGetBytesFromObj -# undef TclGetUnicodeFromObj # define TclGetStringFromObj 0 # define TclGetBytesFromObj 0 # define TclGetUnicodeFromObj 0 @@ -89,6 +87,8 @@ #define TclUtfCharComplete Tcl_UtfCharComplete #define TclUtfNext Tcl_UtfNext #define TclUtfPrev Tcl_UtfPrev +#undef TclListObjGetElements +#undef TclListObjLength #if defined(TCL_NO_DEPRECATED) # define TclListObjGetElements 0 @@ -106,7 +106,7 @@ int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size n = TCL_INDEX_NONE; int result = Tcl_ListObjGetElements(interp, listPtr, &n, objvPtr); if (objcPtr) { - if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && (result == TCL_OK) && (n > INT_MAX)) { if (interp) { Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL); } @@ -121,7 +121,7 @@ int TclListObjLength(Tcl_Interp *interp, Tcl_Obj *listPtr, Tcl_Size n = TCL_INDEX_NONE; int result = Tcl_ListObjLength(interp, listPtr, &n); if (lengthPtr) { - if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && (result == TCL_OK) && (n > INT_MAX)) { if (interp) { Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL); } @@ -136,7 +136,7 @@ int TclDictObjSize(Tcl_Interp *interp, Tcl_Obj *dictPtr, Tcl_Size n = TCL_INDEX_NONE; int result = Tcl_DictObjSize(interp, dictPtr, &n); if (sizePtr) { - if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && (result == TCL_OK) && (n > INT_MAX)) { if (interp) { Tcl_AppendResult(interp, "Dict too large to be processed", (void *)NULL); } @@ -151,7 +151,7 @@ int TclSplitList(Tcl_Interp *interp, const char *listStr, void *argcPtr, Tcl_Size n = TCL_INDEX_NONE; int result = Tcl_SplitList(interp, listStr, &n, argvPtr); if (argcPtr) { - if ((sizeof(int) != sizeof(size_t)) && (result == TCL_OK) && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && (result == TCL_OK) && (n > INT_MAX)) { if (interp) { Tcl_AppendResult(interp, "List too large to be processed", (void *)NULL); } @@ -166,7 +166,7 @@ void TclSplitPath(const char *path, void *argcPtr, const char ***argvPtr) { Tcl_Size n = TCL_INDEX_NONE; Tcl_SplitPath(path, &n, argvPtr); if (argcPtr) { - if ((sizeof(int) != sizeof(size_t)) && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && (n > INT_MAX)) { n = TCL_INDEX_NONE; /* No other way to return an error-situation */ Tcl_Free((void *)*argvPtr); *argvPtr = NULL; @@ -178,7 +178,7 @@ Tcl_Obj *TclFSSplitPath(Tcl_Obj *pathPtr, void *lenPtr) { Tcl_Size n = TCL_INDEX_NONE; Tcl_Obj *result = Tcl_FSSplitPath(pathPtr, &n); if (lenPtr) { - if ((sizeof(int) != sizeof(size_t)) && result && (n > INT_MAX)) { + if ((sizeof(int) != sizeof(Tcl_Size)) && result && (n > INT_MAX)) { Tcl_DecrRefCount(result); return NULL; } |