summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@noemail.net>2006-10-06 14:14:29 (GMT)
committerpatthoyts <patthoyts@noemail.net>2006-10-06 14:14:29 (GMT)
commit5c836dad84b63ad67ada7abd51b01260d0ad6750 (patch)
tree65084b4dab757236a00a67fe3902584c71d09189
parent39b17c56a09746a3e5851919057a6efcbfcf40fe (diff)
downloadtcl-5c836dad84b63ad67ada7abd51b01260d0ad6750.zip
tcl-5c836dad84b63ad67ada7abd51b01260d0ad6750.tar.gz
tcl-5c836dad84b63ad67ada7abd51b01260d0ad6750.tar.bz2
bug #1571954: avoid /RTCc flag with MSVC8tip-278-branch-root
FossilOrigin-Name: 921a289f099db247dcbc819160b427b060fe70af
-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 2f4c9d9..f681ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
+ * win/rules.vc: bug #1571954: avoid /RTCc flag with MSVC8
+
+2006-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
+
* doc/binary.n: TIP #275: Support unsigned values in
* generic/tclBinary.c: binary command. Tests and documentation
* tests/binary.test: updated.
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 28bb903..08ad028 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.10 2006/09/26 20:47:03 patthoyts Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.11 2006/10/06 14:14:29 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 ff4e5b8..e4904de 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.25 2006/09/26 20:47:03 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.26 2006/10/06 14:14:29 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]