diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-05-27 15:47:34 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-05-27 15:47:34 (GMT) |
| commit | 28821a3fc8b593b40739691806bff1d413d72a8a (patch) | |
| tree | 6b8fbc734de1c9e5fc1e6ecf92f0f57378a6559c | |
| parent | b6d01a333ab9a4c3375cdbf9f9797b596a54816d (diff) | |
| parent | 40e5a934ab092fff44bbd0aaa626e49e49309357 (diff) | |
| download | tcl-28821a3fc8b593b40739691806bff1d413d72a8a.zip tcl-28821a3fc8b593b40739691806bff1d413d72a8a.tar.gz tcl-28821a3fc8b593b40739691806bff1d413d72a8a.tar.bz2 | |
merge 8.7
| -rw-r--r-- | .github/workflows/mac-build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/onefiledist.yml | 2 | ||||
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | generic/tclCmdIL.c | 2 | ||||
| -rw-r--r-- | generic/tclExecute.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index bf3c420..a57a6cf 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -2,7 +2,7 @@ name: macOS on: [push] jobs: xcode: - runs-on: macos-11.0 + runs-on: macos-11 defaults: run: shell: bash @@ -24,7 +24,7 @@ jobs: ERROR_ON_FAILURES: 1 MAC_CI: 1 clang: - runs-on: macos-11.0 + runs-on: macos-11 strategy: matrix: cfgopt: diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml index 0cad3d2..f2f6c1e 100644 --- a/.github/workflows/onefiledist.yml +++ b/.github/workflows/onefiledist.yml @@ -38,7 +38,7 @@ jobs: path: 1dist/*.tar macos: name: macOS - runs-on: macos-11.0 + runs-on: macos-11 defaults: run: shell: bash diff --git a/generic/tcl.h b/generic/tcl.h index 9391c6e..029a21c 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2136,7 +2136,7 @@ typedef struct Tcl_EncodingType { #if TCL_UTF_MAX > 3 /* * int isn't 100% accurate as it should be a strict 4-byte value - * (perhaps wchar_t). ILP64/SILP64 systems may have troubles. The + * (perhaps int32_t). ILP64/SILP64 systems may have troubles. The * size of this value must be reflected correctly in regcustom.h. */ typedef int Tcl_UniChar; diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index d3588aa..b9fc84a 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -1241,7 +1241,7 @@ TclInfoFrame( { Interp *iPtr = (Interp *) interp; Tcl_Obj *tmpObj; - Tcl_Obj *lv[20]; /* Keep uptodate when more keys are added to + Tcl_Obj *lv[20] = {NULL}; /* Keep uptodate when more keys are added to * the dict. */ int lc = 0; /* diff --git a/generic/tclExecute.c b/generic/tclExecute.c index debb06e..f9c2954 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5744,7 +5744,7 @@ TEBCresume( { ClientData ptr1, ptr2; int type1, type2; - Tcl_WideInt w1 = 0, w2, wResult; + Tcl_WideInt w1, w2, wResult; case INST_NUM_TYPE: if (GetNumberFromObj(NULL, OBJ_AT_TOS, &ptr1, &type1) != TCL_OK) { |