diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-16 09:11:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-16 09:11:54 (GMT) |
| commit | 94c40f8b7100eb40e174041600f31ec60c4b7bc2 (patch) | |
| tree | 5276bd593c3580934e1d5d617de496d08ac42d13 /generic | |
| parent | 90565904aa22260e8bdee126a55ed12fc12c94d6 (diff) | |
| parent | 635b0327a6edcdd57f406ec19bf6f3659756c2ce (diff) | |
| download | tcl-94c40f8b7100eb40e174041600f31ec60c4b7bc2.zip tcl-94c40f8b7100eb40e174041600f31ec60c4b7bc2.tar.gz tcl-94c40f8b7100eb40e174041600f31ec60c4b7bc2.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclUtil.c | 8 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 1decb05..d5ec040 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1718,14 +1718,14 @@ TclTrimRight( */ do { - int qInc = TclUtfToUCS4(q, &ch2); + pInc = TclUtfToUCS4(q, &ch2); if (ch1 == ch2) { break; } - q += qInc; - bytesLeft -= qInc; + q += pInc; + bytesLeft -= pInc; } while (bytesLeft); if (bytesLeft == 0) { @@ -1771,7 +1771,7 @@ TclTrimLeft( * rely on (trim[numTrim] == '\0'). */ { const char *p = bytes; - int ch1, ch2; + int ch1, ch2; /* Empty strings -> nothing to do */ if ((numBytes == 0) || (numTrim == 0)) { diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 50653ff..0d646aa 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -3113,7 +3113,7 @@ TclZipfs_TclLibrary(void) { Tcl_Obj *vfsInitScript; int found; -#ifdef _WIN32 +#if defined(_WIN32) && !defined(STATIC_BUILD) HMODULE hModule; WCHAR wName[MAX_PATH + LIBRARY_SIZE]; char dllName[(MAX_PATH + LIBRARY_SIZE) * 3]; |