diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-04 13:06:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-04 13:06:15 (GMT) |
| commit | 3f2bb8a02927f794f32b98f7be6f643d0c57b6bb (patch) | |
| tree | f46a4464fb7c38c6dcee9773e076334f97446737 | |
| parent | e2f55284cf4bfdca0a8c1b971e9ca8895ce415e9 (diff) | |
| parent | e51f7da2ee3eeb2de5ed29bffef7c4fd20bc2791 (diff) | |
| download | tcl-3f2bb8a02927f794f32b98f7be6f643d0c57b6bb.zip tcl-3f2bb8a02927f794f32b98f7be6f643d0c57b6bb.tar.gz tcl-3f2bb8a02927f794f32b98f7be6f643d0c57b6bb.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | .github/workflows/linux-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/onefiledist.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 2 | ||||
| -rw-r--r-- | generic/tclStringObj.c | 9 |
5 files changed, 10 insertions, 7 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index f8c30da..52cec15 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -1,5 +1,5 @@ name: Linux -on: +on: push: branches: - "main" diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index b5a586e..c576390 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -1,5 +1,5 @@ name: macOS -on: +on: push: branches: - "main" diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index c6277af..f1cee16 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -1,5 +1,5 @@ name: Build Binaries -on: +on: push: branches: - "main" diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 9773c2a..a7ce43b 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,5 +1,5 @@ name: Windows -on: +on: push: branches: - "main" diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index d2bc1b2..d0703b3 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2751,12 +2751,16 @@ AppendPrintfToObjVA( break; } + case 'p': + if (sizeof(size_t) == sizeof(Tcl_WideInt)) { + size = 2; + } + /* FALLTHRU */ case 'c': case 'i': case 'u': case 'd': case 'o': - case 'p': case 'x': case 'X': seekingConversion = 0; @@ -3137,8 +3141,7 @@ TclStringCat( { Tcl_Obj *objResultPtr, * const *ov; int binary = 1; - Tcl_Size oc; - Tcl_Size length = 0; + Tcl_Size oc, length = 0; int allowUniChar = 1, requestUniChar = 0, forceUniChar = 0; Tcl_Size first = objc - 1; /* Index of first value possibly not empty */ Tcl_Size last = 0; /* Index of last value possibly not empty */ |