summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--win/nmakehlp.c4
-rw-r--r--win/rules.vc6
3 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index dbc232c..e038e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/rules.vc: bug #1571954: avoid /RTCc flag with MSVC8
+
2006-10-05 Jeff Hobbs <jeffh@ActiveState.com>
* library/http/http.tcl (http::geturl): only do geturl url rfc
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 9d5df8e..5f31314 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -10,7 +10,7 @@
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* ----------------------------------------------------------------------------
- * RCS: @(#) $Id: nmakehlp.c,v 1.1.4.2 2006/09/26 21:40:37 patthoyts Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.1.4.3 2006/10/06 14:04:49 patthoyts Exp $
* ----------------------------------------------------------------------------
*/
@@ -407,7 +407,7 @@ ReadFromPipe(
again:
if (lastBuf - pi->buffer + CHUNK > STATICBUFFERSIZE) {
CloseHandle(pi->pipe);
- return -1;
+ return (DWORD)-1;
}
ok = ReadFile(pi->pipe, lastBuf, CHUNK, &dwRead, 0L);
if (!ok || dwRead == 0) {
diff --git a/win/rules.vc b/win/rules.vc
index 1210997..045aebc 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
# Copyright (c) 2003-2006 Patrick Thoyts
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.11.2.3 2006/09/26 21:40:37 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.11.2.4 2006/10/06 14:04:49 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -121,10 +121,6 @@ DEBUGFLAGS = $(DEBUGFLAGS) -RTC1
DEBUGFLAGS = $(DEBUGFLAGS) -GZ
!endif
-!if [nmakehlp -c -RTCc]
-DEBUGFLAGS = $(DEBUGFLAGS) -RTCc
-!endif
-
COMPILERFLAGS =-W3
!if [nmakehlp -c -YX]