diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 07:32:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-17 07:32:17 (GMT) |
| commit | e39e94eb8dae7ab8ba2ae8fca7c376ab4fce2d56 (patch) | |
| tree | 3f03ee455f6f6e4302af676553a042e25fe2ec41 | |
| parent | fb3abfc9c3019d7b9b4ff002319576ef4004881b (diff) | |
| parent | 53b939e3bc6f9b4995c798d45dada91369aa82ad (diff) | |
| download | tcl-e39e94eb8dae7ab8ba2ae8fca7c376ab4fce2d56.zip tcl-e39e94eb8dae7ab8ba2ae8fca7c376ab4fce2d56.tar.gz tcl-e39e94eb8dae7ab8ba2ae8fca7c376ab4fce2d56.tar.bz2 | |
Merge 9.0. Fix compilation (due to new macro's in previous commit)
| -rw-r--r-- | generic/tclCmdAH.c | 2 | ||||
| -rw-r--r-- | generic/tclDictObj.c | 1 | ||||
| -rw-r--r-- | generic/tclFileName.c | 1 | ||||
| -rw-r--r-- | generic/tclIOUtil.c | 1 | ||||
| -rw-r--r-- | generic/tclIndexObj.c | 1 | ||||
| -rw-r--r-- | generic/tclListObj.c | 2 | ||||
| -rw-r--r-- | generic/tclTest.c | 2 | ||||
| -rw-r--r-- | generic/tclUtil.c | 1 |
8 files changed, 9 insertions, 2 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 3901025..1243d21 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -1898,7 +1898,7 @@ PathSplitCmd( Tcl_WrongNumArgs(interp, 1, objv, "name"); return TCL_ERROR; } - res = Tcl_FSSplitPath(objv[1], NULL); + res = Tcl_FSSplitPath(objv[1], (size_t *)NULL); if (res == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "could not read \"%s\": no such file or directory", diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index e547e81..1a076da 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -1061,6 +1061,7 @@ Tcl_DictObjRemove( *---------------------------------------------------------------------- */ +#undef Tcl_DictObjSize int Tcl_DictObjSize( Tcl_Interp *interp, diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 5df1235..9f5b4b2 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -546,6 +546,7 @@ TclpNativeSplitPath( *---------------------------------------------------------------------- */ +#undef Tcl_SplitPath void Tcl_SplitPath( const char *path, /* Pointer to string containing a path. */ diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 822eeef..b206604 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -3874,6 +3874,7 @@ FsListMounts( *--------------------------------------------------------------------------- */ +#undef Tcl_FSSplitPath Tcl_Obj * Tcl_FSSplitPath( Tcl_Obj *pathPtr, /* The pathname to split. */ diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index a189a96..682e908 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.c @@ -986,6 +986,7 @@ Tcl_WrongNumArgs( *---------------------------------------------------------------------- */ +#undef Tcl_ParseArgsObjv int Tcl_ParseArgsObjv( Tcl_Interp *interp, /* Place to store error message. */ diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 17dd466..c0d1b88 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -503,6 +503,7 @@ TclListObjRange( *---------------------------------------------------------------------- */ +#undef Tcl_ListObjGetElements int Tcl_ListObjGetElements( Tcl_Interp *interp, /* Used to report errors if not NULL. */ @@ -865,6 +866,7 @@ Tcl_ListObjIndex( *---------------------------------------------------------------------- */ +#undef Tcl_ListObjLength int Tcl_ListObjLength( Tcl_Interp *interp, /* Used to report errors if not NULL. */ diff --git a/generic/tclTest.c b/generic/tclTest.c index 7db35e1..0af2d65 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6984,7 +6984,7 @@ TestUtfNextCmd( bytes = Tcl_GetString(objv[1]); numBytes = objv[1]->length; - if (numBytes + 4 > sizeof(buffer)) { + if (numBytes + 4U > sizeof(buffer)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "\"testutfnext\" can only handle %" TCL_Z_MODIFIER "u bytes", sizeof(buffer) - 4)); diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 8f1e1ad..30be4ef 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -845,6 +845,7 @@ TclCopyAndCollapse( *---------------------------------------------------------------------- */ +#undef Tcl_SplitList int Tcl_SplitList( Tcl_Interp *interp, /* Interpreter to use for error reporting. If |