* tests/chanio.test (chan-io-53.9):

* tests/io.test (io-53.9): Made test cleanup robust against
the possibility of slow process shutdown on Windows.
* win/tcl.m4: Added -D_CRT_SECURE_NO_DEPRECATE and
-DCRT_NONSTDC_NO_DEPRECATE to the MSVC compilation flags
so that the compilation doesn't barf on perfectly reasonable
Posix system calls.
* win/configure: Manually patched (don't have the right autoconf
to hand).

5 files changed, 26 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index daf5103..5287637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,16 @@
 	has the correct definition of SymbolicLinkReparseBuffer, exposing
 	the mismatch, and making tests cmdAH-19.4.1, fCmd-28.*, and
 	filename-11.* fail. 
+	* tests/chanio.test (chan-io-53.9):
+	* tests/io.test (io-53.9): Made test cleanup robust against
+	the possibility of slow process shutdown on Windows.
+
+	* win/tcl.m4: Added -D_CRT_SECURE_NO_DEPRECATE and 
+	-DCRT_NONSTDC_NO_DEPRECATE to the MSVC compilation flags
+	so that the compilation doesn't barf on perfectly reasonable
+	Posix system calls.
+	* win/configure: Manually patched (don't have the right autoconf
+	to hand).
 
 2008-04-04  Andreas Kupries  <andreask@activestate.com>
 
diff --git a/tests/chanio.test b/tests/chanio.test
index 57b115c..ceb8b8c 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: chanio.test,v 1.5 2008/04/04 20:14:19 andreas_kupries Exp $
+# RCS: @(#) $Id: chanio.test,v 1.6 2008/04/06 00:37:19 kennykb Exp $
 
 if {[catch {package require tcltest 2}]} {
     chan puts stderr "Skipping tests in [info script].  tcltest 2 required."
@@ -6976,8 +6976,10 @@ test chan-io-53.9 {CopyData: -size and event interaction, Bug 780533} -setup {
 } -cleanup {
     chan close $pipe
     rename ::done {}
-    removeFile out
-    removeFile err
+    after 1000;			# Allow Windows time to figure out that the
+                                # process is gone
+    catch {removeFile out}
+    catch {removeFile err}
     catch {unset ::forever}
 } -result OK
 
diff --git a/tests/io.test b/tests/io.test
index 488f28b..7489f4f 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: io.test,v 1.82 2008/04/04 20:14:17 andreas_kupries Exp $
+# RCS: @(#) $Id: io.test,v 1.83 2008/04/06 00:37:19 kennykb Exp $
 
 if {[catch {package require tcltest 2}]} {
     puts stderr "Skipping tests in [info script].  tcltest 2 required."
@@ -6976,8 +6976,9 @@ test io-53.9 {CopyData: -size and event interaction, Bug 780533} -setup {
 } -cleanup {
     close $pipe
     rename ::done {}
-    removeFile out
-    removeFile err
+    after 1000;			# Give Windows time to kill the process
+    catch {removeFile out}
+    catch {removeFile err}
     catch {unset ::forever}
 } -result OK
 
diff --git a/win/configure b/win/configure
index e10d319..e69a398 100755
--- a/win/configure
+++ b/win/configure
@@ -4122,6 +4122,9 @@ _ACEOF
 	MAKE_EXE="\${CC} -Fe\$@"
 	LIBPREFIX=""
 
+	CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+	CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+
 	EXTRA_CFLAGS=""
 	CFLAGS_WARNING="-W3"
 	LDFLAGS_DEBUG="-debug:full"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 59b51c9..1a46527 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -622,7 +622,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
 		-I\"${MSSDK}/Include/crt\" -I\"${MSSDK}/Include/crt/sys\""
 	    RC="\"${MSSDK}/bin/rc.exe\""
-	    CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
+	    CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}"
 	    # Do not use -O2 for Win64 - this has proved buggy in code gen.
 	    CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}"
 	    lflags="-nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\""
@@ -747,6 +747,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	MAKE_EXE="\${CC} -Fe\[$]@"
 	LIBPREFIX=""
 
+	CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+	CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE"
+
 	EXTRA_CFLAGS=""
 	CFLAGS_WARNING="-W3"
 	LDFLAGS_DEBUG="-debug:full"