From c561b0e117976a55bb05357fe5b1d45bb5fdad4a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 2 Mar 2019 17:21:43 +0000 Subject: Add build with -DTCL_UTF_MAX=6 to travis CI. Also fix 2 gcc compiler-warnings occurring with -DTCL_UTF_MAX=6 --- .travis.yml | 12 ++++++++++++ generic/tclUtf.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d327880..bfe205b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,6 +69,18 @@ matrix: - g++-7 env: - BUILD_DIR=unix + - os: linux + dist: xenial + compiler: gcc-7 + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + env: + - BUILD_DIR=unix + - CFGOPT=CFLAGS="-DTCL_UTF_MAX=6" - os: osx osx_image: xcode8 env: diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 9492742..fd09ba3 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -1957,7 +1957,7 @@ Tcl_UniCharCaseMatch( if ((p != '[') && (p != '?') && (p != '\\')) { if (nocase) { while (*uniStr && (p != *uniStr) - && (p != Tcl_UniCharToLower(*uniStr))) { + && (p != (Tcl_UniChar)Tcl_UniCharToLower(*uniStr))) { uniStr++; } } else { @@ -2149,7 +2149,7 @@ TclUniCharMatch( if ((p != '[') && (p != '?') && (p != '\\')) { if (nocase) { while ((string < stringEnd) && (p != *string) - && (p != Tcl_UniCharToLower(*string))) { + && (p != (Tcl_UniChar)Tcl_UniCharToLower(*string))) { string++; } } else { -- cgit v0.12