diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-22 12:35:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-22 12:35:58 (GMT) |
| commit | 185db606f066a1ec6904691d6446ef62e184f674 (patch) | |
| tree | 8eeac72a4bc14b5e0f0c46d9ee502c285ddf05ae | |
| parent | 326c72a0d919b2c96c48a3df365dc8a7256dacd7 (diff) | |
| parent | ffda1b67f7a2399cc521a0d808f9b099f0bf26c0 (diff) | |
| download | tcl-185db606f066a1ec6904691d6446ef62e184f674.zip tcl-185db606f066a1ec6904691d6446ef62e184f674.tar.gz tcl-185db606f066a1ec6904691d6446ef62e184f674.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .github/workflows/linux-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 2 | ||||
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 12 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 4 |
6 files changed, 19 insertions, 5 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 6b643bb..0cbf774 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-20.04 diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 86b9bfd..b8321f7 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-11 diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 1f530ab..43e2019 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -1,5 +1,7 @@ name: Windows on: [push] +permissions: + contents: read env: ERROR_ON_FAILURES: 1 jobs: diff --git a/generic/tcl.decls b/generic/tcl.decls index 24d71c8..6b67e77 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2325,7 +2325,7 @@ declare 630 { # ----- BASELINE -- FOR -- 8.6.0 ----- # -declare 673 { +declare 675 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index f299d50..f2eed87 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1857,7 +1857,9 @@ EXTERN void Tcl_ZlibStreamSetCompressionDictionary( /* Slot 670 is reserved */ /* Slot 671 is reserved */ /* Slot 672 is reserved */ -/* 673 */ +/* Slot 673 is reserved */ +/* Slot 674 is reserved */ +/* 675 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2567,7 +2569,9 @@ typedef struct TclStubs { void (*reserved670)(void); void (*reserved671)(void); void (*reserved672)(void); - void (*tclUnusedStubEntry) (void); /* 673 */ + void (*reserved673)(void); + void (*reserved674)(void); + void (*tclUnusedStubEntry) (void); /* 675 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3902,8 +3906,10 @@ extern const TclStubs *tclStubsPtr; /* Slot 670 is reserved */ /* Slot 671 is reserved */ /* Slot 672 is reserved */ +/* Slot 673 is reserved */ +/* Slot 674 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 673 */ + (tclStubsPtr->tclUnusedStubEntry) /* 675 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 3a7db04..23aba3e 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1662,7 +1662,9 @@ const TclStubs tclStubs = { 0, /* 670 */ 0, /* 671 */ 0, /* 672 */ - TclUnusedStubEntry, /* 673 */ + 0, /* 673 */ + 0, /* 674 */ + TclUnusedStubEntry, /* 675 */ }; /* !END!: Do not edit above this line. */ |