diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 17:21:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 17:21:43 (GMT) |
| commit | c561b0e117976a55bb05357fe5b1d45bb5fdad4a (patch) | |
| tree | 3b399c1adbd1e75d7cbd1e5e2697eb59dd0ccd28 | |
| parent | d0eefe67c87f69a16ae393d0ab5eb0847292c340 (diff) | |
| download | tcl-c561b0e117976a55bb05357fe5b1d45bb5fdad4a.zip tcl-c561b0e117976a55bb05357fe5b1d45bb5fdad4a.tar.gz tcl-c561b0e117976a55bb05357fe5b1d45bb5fdad4a.tar.bz2 | |
Add build with -DTCL_UTF_MAX=6 to travis CI. Also fix 2 gcc compiler-warnings occurring with -DTCL_UTF_MAX=6
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | 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 { |