Merge tip-548

4 files changed, 8 insertions, 8 deletions

diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c
index 5b0a0b3..c02c7e4 100644
--- a/generic/tclAlloc.c
+++ b/generic/tclAlloc.c
@@ -592,7 +592,7 @@ TclpRealloc(
     }
 
     if (expensive) {
-	void *newPtr;
+	char *newPtr;
 
 	Tcl_MutexUnlock(allocMutexPtr);
 
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index a6f7361..9df6d20 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -395,7 +395,7 @@ test cmdMZ-6.5a {Tcl_TimeRateObjCmd: result format and one iteration} {
 test cmdMZ-6.5b {Tcl_TimeRateObjCmd: result format without iterations} {
     regexp {^0 \ws/# 0 # 0 #/sec 0 net-ms$} [timerate {} 0 0]
 } 1
-test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measument} {
+test cmdMZ-6.6 {Tcl_TimeRateObjCmd: slower commands take longer, but it remains almost the same time of measument} knownMsvcBug {
     set m1 [timerate {_nrt_sleep 0} 20]
     set m2 [timerate {_nrt_sleep 0.2} 20]
     list \
diff --git a/tests/http.test b/tests/http.test
index cf30348..2184449 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -186,7 +186,7 @@ test http-3.7 {http::geturl} -body {
 <h2>GET $tail</h2>
 </body></html>"
 test http-3.8 {http::geturl} -body {
-    set token [http::geturl $url -query Name=Value&Foo=Bar -timeout 2000]
+    set token [http::geturl $url -query Name=Value&Foo=Bar -timeout 3000]
     http::data $token
 } -cleanup {
     http::cleanup $token
@@ -352,7 +352,7 @@ test http-3.24 {http::geturl parse failures} -body {
 test http-3.25 {http::meta} -setup {
     unset -nocomplain m token
 } -body {
-    set token [http::geturl $url -timeout 2000]
+    set token [http::geturl $url -timeout 3000]
     array set m [http::meta $token]
     lsort [array names m]
 } -cleanup {
@@ -362,7 +362,7 @@ test http-3.25 {http::meta} -setup {
 test http-3.26 {http::meta} -setup {
     unset -nocomplain m token
 } -body {
-    set token [http::geturl $url -headers {X-Check 1} -timeout 2000]
+    set token [http::geturl $url -headers {X-Check 1} -timeout 3000]
     array set m [http::meta $token]
     lsort [array names m]
 } -cleanup {
@@ -588,7 +588,7 @@ test http-4.14 {http::Event} -body {
 test http-4.15 {http::Event} -body {
     # This test may fail if you use a proxy server. That is to be
     # expected and is not a problem with Tcl.
-    set token [http::geturl //not_a_host.tcl.tk -timeout 1000 -command \#]
+    set token [http::geturl //not_a_host.tcl.tk -timeout 3000 -command \#]
     http::wait $token
     http::status $token
     # error codes vary among platforms.
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 39f60e5..60337da 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -2808,7 +2808,7 @@ TclpObjNormalizePath(
 	 */
 
 	Tcl_DStringInit(&ds);
-	Tcl_WCharToUtfDString((const wchar_t *)Tcl_DStringValue(&dsNorm),
+	Tcl_WCharToUtfDString((const WCHAR *) Tcl_DStringValue(&dsNorm),
 		Tcl_DStringLength(&dsNorm)>>1, &ds);
 	nextCheckpoint = Tcl_DStringLength(&ds);
 	if (*lastValidPathEnd != 0) {
@@ -2985,7 +2985,7 @@ TclpNativeToNormalized(
     char *copy, *p;
 
     Tcl_DStringInit(&ds);
-    Tcl_WCharToUtfDString((const wchar_t *)clientData, -1, &ds);
+    Tcl_WCharToUtfDString((const WCHAR *) clientData, -1, &ds);
     copy = Tcl_DStringValue(&ds);
     len = Tcl_DStringLength(&ds);