summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--generic/tclCompExpr.c5
-rw-r--r--generic/tclExecute.c14
-rw-r--r--win/makefile.vc32
4 files changed, 30 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 90ffe38..d3f2057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-17 Kevin B. Kenny <kennykb@acm.org>
+
+ * generic/tclCompExpr.c: Moved a misplaced declaration that blocked
+ compilation on VC++.
+ * generic/tclExecute.c: Silenced several VC++ compiler warnings about
+ converting 'long' to 'unsigned short'.
+
+2007-10-16 David Gravereaux <davygrvy@pobox.com>
+
+ * win/makefile.vc: removed old dependency cruft that is no longer
+ needed.
+
2007-10-15 Don Porter <dgp@users.sourceforge.net>
* generic/tclIOCmd.c: Revise [open] so that it interprets leading
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index 982b23f..7ca8327 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.53.2.10 2007/10/16 03:50:31 dgp Exp $
+ * RCS: @(#) $Id: tclCompExpr.c,v 1.53.2.11 2007/10/17 14:38:34 dgp Exp $
*/
#include "tclInt.h"
@@ -751,10 +751,11 @@ ParseExpr(
&& (lastStart[2] >= '0')
&& (lastStart[2] <= '9')) {
const char *end = lastStart + 2;
+ Tcl_Obj* copy;
while (isdigit(*end)) {
end++;
}
- Tcl_Obj *copy = Tcl_NewStringObj(lastStart,
+ copy = Tcl_NewStringObj(lastStart,
end - lastStart);
if (TclCheckBadOctal(NULL,
Tcl_GetString(copy))) {
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index dd05444..78c3a82 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -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: tclExecute.c,v 1.285.2.19 2007/09/17 15:03:44 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.285.2.20 2007/10/17 14:38:35 dgp Exp $
*/
#include "tclInt.h"
@@ -5480,7 +5480,8 @@ TclExecuteByteCode(
if (l1 >= 3
&& (unsigned long) l1 < (sizeof(Exp32Index)
/ sizeof(unsigned short)) - 1) {
- unsigned short base = Exp32Index[l1-3] + l2 - 9;
+ unsigned short base = Exp32Index[l1-3]
+ + (unsigned short) l2 - 9;
if (base < Exp32Index[l1-2]) {
/*
* 32-bit number raised to intermediate power,
@@ -5500,7 +5501,8 @@ TclExecuteByteCode(
if (-l1 >= 3
&& (unsigned long)(-l1) < (sizeof(Exp32Index)
/ sizeof(unsigned short)) - 1) {
- unsigned short base = Exp32Index[-l1-3] + l2 - 9;
+ unsigned short base
+ = Exp32Index[-l1-3] + (unsigned short) l2 - 9;
if (base < Exp32Index[-l1-2]) {
long lResult = (oddExponent) ?
-Exp32Value[base] : Exp32Value[base];
@@ -5624,7 +5626,8 @@ TclExecuteByteCode(
if (w1 >= 3
&& (Tcl_WideUInt) w1 < (sizeof(Exp64Index)
/ sizeof(unsigned short)) - 1) {
- unsigned short base = Exp64Index[w1-3] + l2 - 17;
+ unsigned short base
+ = Exp64Index[w1-3] + (unsigned short) l2 - 17;
if (base < Exp64Index[w1-2]) {
/*
* 64-bit number raised to intermediate power,
@@ -5644,7 +5647,8 @@ TclExecuteByteCode(
if (-w1 >= 3
&& (Tcl_WideUInt) (-w1) < (sizeof(Exp64Index)
/ sizeof(unsigned short)) - 1) {
- unsigned short base = Exp64Index[-w1-3] + l2 - 17;
+ unsigned short base
+ = Exp64Index[-w1-3] + (unsigned short) l2 - 17;
if (base < Exp64Index[-w1-2]) {
Tcl_WideInt wResult = (oddExponent) ?
-Exp64Value[base] : Exp64Value[base];
diff --git a/win/makefile.vc b/win/makefile.vc
index a0e6894..20b2ceb 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.160.2.6 2007/10/16 03:50:34 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.160.2.7 2007/10/17 14:38:40 dgp Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -834,9 +834,10 @@ $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will
-# improve incrimental build accuracy without having to resort to a
-# full rebuild just because some non-global header file like tclCompile.h
-# was changed. These rules aren't needed when building from scratch.
+# improve incremental build accuracy without having to resort to a
+# full rebuild just because some non-global header file like
+# tclCompile.h was changed. These rules aren't needed when building
+# from scratch.
#---------------------------------------------------------------------
depend:
@@ -850,34 +851,13 @@ $(TCLOBJS)
<<
!endif
-#" emacs fix
-
#---------------------------------------------------------------------
# Dependency rules
#---------------------------------------------------------------------
-$(GENERICDIR)\regcomp.c: \
- $(GENERICDIR)\regguts.h \
- $(GENERICDIR)\regc_lex.c \
- $(GENERICDIR)\regc_color.c \
- $(GENERICDIR)\regc_nfa.c \
- $(GENERICDIR)\regc_cvec.c \
- $(GENERICDIR)\regc_locale.c
-$(GENERICDIR)\regcustom.h: \
- $(GENERICDIR)\tclInt.h \
- $(GENERICDIR)\tclPort.h \
- $(GENERICDIR)\regex.h
-$(GENERICDIR)\regexec.c: \
- $(GENERICDIR)\rege_dfa.c \
- $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regerror.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfree.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regfronts.c: $(GENERICDIR)\regguts.h
-$(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
-
!if exist("$(OUT_DIR)\depend.mk")
!include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in effect.
+!message *** Dependency rules in use.
!else
!message *** Dependency rules are not being used.
!endif