From 326c72a0d919b2c96c48a3df365dc8a7256dacd7 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 22 May 2022 11:59:15 +0000 Subject: Disable C4090 warning; See: [https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/39071] --- win/rules.vc | 4 ++-- win/tclWinPort.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/win/rules.vc b/win/rules.vc index 3107756..47c0742 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1470,8 +1470,8 @@ cdebug = $(cdebug) -Zi !endif # $(DEBUG) -# cwarn includes default warning levels, also C4146 is useless. -cwarn = $(WARNINGS) -wd4146 +# cwarn includes default warning levels, also C4090 (buggy) and C4146 is useless. +cwarn = $(WARNINGS) -wd4090 -wd4146 !if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64" # Disable pointer<->int warnings related to cast between different sizes diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 0a68abe..5e7f9c3 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -486,6 +486,7 @@ typedef DWORD_PTR * PDWORD_PTR; * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0) */ #if defined(_MSC_VER) +# pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */ # pragma warning(disable:4146) # pragma warning(disable:4244) # if _MSC_VER >= 1400 -- cgit v0.12 From 983a154c51cd92b7dba7b6d79ce073721d417a33 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 22 May 2022 12:23:25 +0000 Subject: 2 more unused stub entries --- generic/tcl.decls | 2 +- generic/tclDecls.h | 12 +++++++++--- generic/tclStubInit.c | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generic/tcl.decls b/generic/tcl.decls index 8536168..e07ae5e 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2111,7 +2111,7 @@ declare 579 { # ----- BASELINE -- FOR -- 8.5.0 ----- # -declare 673 { +declare 675 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index b8b17d2..246e2c9 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3505,9 +3505,11 @@ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, /* Slot 670 is reserved */ /* Slot 671 is reserved */ /* Slot 672 is reserved */ +/* Slot 673 is reserved */ +/* Slot 674 is reserved */ #ifndef TclUnusedStubEntry_TCL_DECLARED #define TclUnusedStubEntry_TCL_DECLARED -/* 673 */ +/* 675 */ EXTERN void TclUnusedStubEntry(void); #endif @@ -4218,7 +4220,9 @@ typedef struct TclStubs { VOID *reserved670; VOID *reserved671; VOID *reserved672; - void (*tclUnusedStubEntry) (void); /* 673 */ + VOID *reserved673; + VOID *reserved674; + void (*tclUnusedStubEntry) (void); /* 675 */ } TclStubs; extern TclStubs *tclStubsPtr; @@ -6664,9 +6668,11 @@ extern TclStubs *tclStubsPtr; /* Slot 670 is reserved */ /* Slot 671 is reserved */ /* Slot 672 is reserved */ +/* Slot 673 is reserved */ +/* Slot 674 is reserved */ #ifndef TclUnusedStubEntry #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 673 */ + (tclStubsPtr->tclUnusedStubEntry) /* 675 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index e7dc0c1..0bebc15 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1471,7 +1471,9 @@ TclStubs tclStubs = { NULL, /* 670 */ NULL, /* 671 */ NULL, /* 672 */ - TclUnusedStubEntry, /* 673 */ + NULL, /* 673 */ + NULL, /* 674 */ + TclUnusedStubEntry, /* 675 */ }; /* !END!: Do not edit above this line. */ -- cgit v0.12 From ffda1b67f7a2399cc521a0d808f9b099f0bf26c0 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 22 May 2022 12:24:27 +0000 Subject: See: [https://github.com/tcltk/tcl/pull/13] --- .github/workflows/linux-build.yml | 2 ++ .github/workflows/mac-build.yml | 2 ++ .github/workflows/win-build.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 909f407..b94ed97 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -1,5 +1,7 @@ name: Linux on: [push] +permissions: + contents: read jobs: gcc: runs-on: ubuntu-18.04 diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 5029794..8593989 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -1,5 +1,7 @@ name: macOS on: [push] +permissions: + contents: read jobs: xcode: runs-on: macos-10.15 diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 8e9f2d5..79a7e68 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,5 +1,7 @@ name: Windows on: [push] +permissions: + contents: read jobs: msvc: runs-on: windows-2019 -- cgit v0.12