Fix gcc warning, using gcc-4.3.4 on cygwin

warning: array subscript has type 'char'
win/makefile.vc       Revert to version 1.203 [Bug #2912773]

6 files changed, 21 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index efb8032..9b37277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-11  Jan Nijtmans  <nijtmans@users.sf.net>
+
+    * generic/tclBinary.c:  Fix gcc warning, using gcc-4.3.4 on cygwin
+    * generic/tclCompExpr.c warning: array subscript has type 'char'
+    * generic/tclPkg.c
+    * libtommath/bn_mp_read_radix.c
+    * win/makefile.vc       Revert to version 1.203 [Bug #2912773]
+
 2009-12-11  Donal K. Fellows  <dkf@users.sf.net>
 
 	* tools/tcltk-man2html.tcl (long-toc, cross-reference): [FRQ 2897296]:
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index c360c8f..4c2d47e 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBinary.c,v 1.56 2009/11/18 21:59:51 nijtmans Exp $
+ * RCS: @(#) $Id: tclBinary.c,v 1.57 2009/12/11 22:52:09 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -2497,7 +2497,7 @@ BinaryDecodeUu(
 	    if (data < dataend) {
 		d[i] = c = *data++;
 		if (c < 33 || c > 96) {
-		    if (strict || !isspace(c)) {
+		    if (strict || !isspace(c & 255)) {
 			goto badUu;
 		    }
 		    i--;
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 47c8671..2677c51 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclCompExpr.c,v 1.100 2009/09/07 07:28:38 das Exp $
+ * RCS: @(#) $Id: tclCompExpr.c,v 1.101 2009/12/11 22:52:09 nijtmans Exp $
  */
 
 #include "tclInt.h"
@@ -752,7 +752,7 @@ ParseExpr(
 				const char *end = lastStart + 2;
 				Tcl_Obj *copy;
 
-				while (isdigit(*end)) {
+				while (isdigit(*end & 255)) {
 				    end++;
 				}
 				copy = Tcl_NewStringObj(lastStart,
diff --git a/generic/tclPkg.c b/generic/tclPkg.c
index 7bac7eb..3753445 100644
--- a/generic/tclPkg.c
+++ b/generic/tclPkg.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclPkg.c,v 1.39 2009/02/10 22:49:49 nijtmans Exp $
+ * RCS: @(#) $Id: tclPkg.c,v 1.40 2009/12/11 22:52:09 nijtmans Exp $
  *
  * TIP #268.
  * Heavily rewritten to handle the extend version numbers, and extended
@@ -1865,7 +1865,7 @@ Tcl_PkgInitStubsCheck(
 	int count = 0;
 
 	while (*p) {
-	    count += !isdigit(*p++);
+	    count += !isdigit(*p++ & 255);
 	}
 	if (count == 1) {
 	    if (0 != strncmp(version, actualVersion, strlen(version))) {
diff --git a/libtommath/bn_mp_read_radix.c b/libtommath/bn_mp_read_radix.c
index 75859f8..37d902d 100644
--- a/libtommath/bn_mp_read_radix.c
+++ b/libtommath/bn_mp_read_radix.c
@@ -48,7 +48,7 @@ int mp_read_radix (mp_int * a, const char *str, int radix)
      * this allows numbers like 1AB and 1ab to represent the same  value
      * [e.g. in hex]
      */
-    ch = (char) ((radix < 36) ? toupper (*str) : *str);
+    ch = (char) ((radix < 36) ? toupper (*str & 255) : *str);
     for (y = 0; y < 64; y++) {
       if (ch == mp_s_rmap[y]) {
          break;
@@ -89,6 +89,6 @@ int mp_read_radix (mp_int * a, const char *str, int radix)
 
 /* $Source: /root/tcl/repos-to-convert/tcl/libtommath/bn_mp_read_radix.c,v $ */
 /* Tom's revision is 1.4. */
-/* $Revision: 1.5 $ */
-/* $Date: 2006/12/01 00:31:32 $ */
+/* $Revision: 1.6 $ */
+/* $Date: 2009/12/11 22:52:09 $ */
 
diff --git a/win/makefile.vc b/win/makefile.vc
index 484bb1e..08ac169 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
 # Copyright (c) 2003-2008 Pat Thoyts.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.204 2009/11/26 07:01:52 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.205 2009/12/11 22:52:09 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -420,10 +420,7 @@ PLATFORMOBJS = \
 	$(TMP_DIR)\tclWinSock.obj \
 	$(TMP_DIR)\tclWinThrd.obj \
 	$(TMP_DIR)\tclWinTime.obj \
-!if $(STATIC_BUILD)
-	$(TMP_DIR)\tclStubLib.obj
-	$(TMP_DIR)\tclOOStubLib.obj
-!else
+!if !$(STATIC_BUILD)
 	$(TMP_DIR)\tcl.res
 !endif
 
@@ -623,7 +620,7 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c
 !if $(TCL_USE_STATIC_PACKAGES)
 $(TCLDDELIB):
 !else
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBOBJS)
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
 !endif
 !else
@@ -637,7 +634,7 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
 !if $(TCL_USE_STATIC_PACKAGES)
 $(TCLREGLIB):
 !else
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBOBJS)
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
 !endif
 !else