diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-13 09:07:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-13 09:07:58 (GMT) |
| commit | fe00b6dcf66b299d9ea42fa1f9a7282c6475159c (patch) | |
| tree | 6974d6bc309be19a48263ecff0e2f619045bc8a3 | |
| parent | ceb95678742fb22d8afc60bb462511af63c2dc2b (diff) | |
| parent | 81e7623b785648f4b7c7ffdd8f1647c876bd4c45 (diff) | |
| download | tcl-fe00b6dcf66b299d9ea42fa1f9a7282c6475159c.zip tcl-fe00b6dcf66b299d9ea42fa1f9a7282c6475159c.tar.gz tcl-fe00b6dcf66b299d9ea42fa1f9a7282c6475159c.tar.bz2 | |
Merge 8.6 Eliminate some (correct but actually harmless) warnings only happening on win64
| -rw-r--r-- | generic/tclStringObj.c | 8 | ||||
| -rw-r--r-- | win/tclAppInit.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 66647f0..8630bfd 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -3410,7 +3410,7 @@ TclStringCmp( if (nocase) { s1 = (char *) Tcl_GetUnicodeFromObj(value1Ptr, &s1len); s2 = (char *) Tcl_GetUnicodeFromObj(value2Ptr, &s2len); - memCmpFn = (memCmpFn_t)Tcl_UniCharNcasecmp; + memCmpFn = (memCmpFn_t)(void *)Tcl_UniCharNcasecmp; } else { s1len = Tcl_GetCharLength(value1Ptr); s2len = Tcl_GetCharLength(value2Ptr); @@ -3435,7 +3435,7 @@ TclStringCmp( s1len *= sizeof(Tcl_UniChar); s2len *= sizeof(Tcl_UniChar); } else { - memCmpFn = (memCmpFn_t) Tcl_UniCharNcmp; + memCmpFn = (memCmpFn_t)(void *)Tcl_UniCharNcmp; } } } @@ -3493,11 +3493,11 @@ TclStringCmp( */ if ((reqlength < 0) && !nocase) { - memCmpFn = (memCmpFn_t) TclpUtfNcmp2; + memCmpFn = (memCmpFn_t)(void *)TclpUtfNcmp2; } else { s1len = Tcl_NumUtfChars(s1, s1len); s2len = Tcl_NumUtfChars(s2, s2len); - memCmpFn = (memCmpFn_t) + memCmpFn = (memCmpFn_t)(void *) (nocase ? Tcl_UtfNcasecmp : Tcl_UtfNcmp); } } diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 59c21e5..de5f788 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -29,7 +29,7 @@ extern Tcl_PackageInitProc Tcltest_Init; extern Tcl_PackageInitProc Tcltest_SafeInit; #endif /* TCL_TEST */ -#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES +#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES extern Tcl_PackageInitProc Registry_Init; extern Tcl_PackageInitProc Dde_Init; extern Tcl_PackageInitProc Dde_SafeInit; @@ -164,7 +164,7 @@ Tcl_AppInit( return TCL_ERROR; } -#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES +#if defined(STATIC_BUILD) && defined(TCL_USE_STATIC_PACKAGES) && TCL_USE_STATIC_PACKAGES if (Registry_Init(interp) == TCL_ERROR) { return TCL_ERROR; } |