diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-29 09:27:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-29 09:27:09 (GMT) |
| commit | 4ed38fd424a42ac70925522d6fe3706651181691 (patch) | |
| tree | 7919c969b84fbcffb92305910b26bb4c41012e2e | |
| parent | a7e88b5393d87cb3ccadc57eb8d5c00b02c939f6 (diff) | |
| parent | e62fbde58cf1c61130e3675d2f262b2939e6599a (diff) | |
| download | tcl-4ed38fd424a42ac70925522d6fe3706651181691.zip tcl-4ed38fd424a42ac70925522d6fe3706651181691.tar.gz tcl-4ed38fd424a42ac70925522d6fe3706651181691.tar.bz2 | |
Merge 8.7. If TCL_NO_DEPRECATED always compile tclTest.o with TCL_UTF_MAX=4 (Because - otherwise the UTF-16 compatibility layer would be used, which is not present)
| -rw-r--r-- | .github/workflows/linux-build.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 3 | ||||
| -rw-r--r-- | generic/tclTest.c | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index cb93bd4..c365faa 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -12,6 +12,7 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" + - "--enable-symbols=all" defaults: run: shell: bash diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index a57a6cf..747dbc3 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -32,6 +32,7 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" + - "--enable-symbols=all" defaults: run: shell: bash diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 547d27e..e3c991e 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -17,7 +17,7 @@ jobs: - "CHECKS=nodep" - "OPTS=static" - "OPTS=symbols" - - "OPTS=memdbg" + - "OPTS=symbols STATS=compdbg,memdbg" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout @@ -57,6 +57,7 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" + - "--enable-symbols=all" # Using powershell means we need to explicitly stop on failure steps: - name: Install MSYS2 diff --git a/generic/tclTest.c b/generic/tclTest.c index 0ce5e83..30681d9 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -19,7 +19,9 @@ #ifndef USE_TCL_STUBS # define USE_TCL_STUBS #endif -#ifndef TCL_NO_DEPRECATED +#ifdef TCL_NO_DEPRECATED +# define TCL_UTF_MAX 4 +#else # define TCL_NO_DEPRECATED #endif #include "tclInt.h" |