From 77ae9912ce0a04e499e2ad85d212aaa2cc895b74 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 28 Mar 2011 07:54:04 +0000 Subject: gcc warning: unused variable "key" --- generic/tclHash.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/generic/tclHash.c b/generic/tclHash.c index 53d9919..b5baf22 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -1191,8 +1191,6 @@ RebuildTable(tablePtr) for (hPtr = *oldChainPtr; hPtr != NULL; hPtr = *oldChainPtr) { *oldChainPtr = hPtr->nextPtr; - key = (VOID *) Tcl_GetHashKey (tablePtr, hPtr); - #if TCL_HASH_KEY_STORE_HASH if (typePtr->hashKeyProc == NULL || typePtr->flags & TCL_HASH_KEY_RANDOMIZE_HASH) { @@ -1203,6 +1201,7 @@ RebuildTable(tablePtr) hPtr->nextPtr = tablePtr->buckets[index]; tablePtr->buckets[index] = hPtr; #else + key = (VOID *) Tcl_GetHashKey (tablePtr, hPtr); if (typePtr->hashKeyProc) { unsigned int hash; hash = typePtr->hashKeyProc (tablePtr, (VOID *) key); -- cgit v0.12 From 1c847fd20258b21754d3ef36e89352281e708cee Mon Sep 17 00:00:00 2001 From: andreask Date: Wed, 30 Mar 2011 22:29:19 +0000 Subject: Fixed execute permission for unix/ldAix on this branch. core-8-4-branch and trunk are ok, so a merge is not required. --- tools/configure | 0 unix/ldAix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 tools/configure mode change 100644 => 100755 unix/ldAix diff --git a/tools/configure b/tools/configure old mode 100755 new mode 100644 diff --git a/unix/ldAix b/unix/ldAix old mode 100644 new mode 100755 index cf37d40..51b2995 --- a/unix/ldAix +++ b/unix/ldAix @@ -1,5 +1,5 @@ #!/bin/sh -# +# # ldAix ldCmd ldArg ldArg ... # # This shell script provides a wrapper for ld under AIX in order to -- cgit v0.12 From a52adf6f4da63486cacc0d10c10d297ab6d449ff Mon Sep 17 00:00:00 2001 From: Kevin B Kenny Date: Sat, 2 Apr 2011 21:55:39 +0000 Subject: Replaced another couple of 'double' declarations with 'volatile double' to work around misrounding issues in mingw-gcc 3.4.5. --- ChangeLog | 6 ++++++ generic/tclStrToD.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 168dc0b..f1ab8a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-02 Kevin B. Kenny + + * generic/tclStrToD.c (QuickConversion): Replaced another couple + of 'double' declarations with 'volatile double' to work around + misrounding issues in mingw-gcc 3.4.5. + 2011-03-24 Donal K. Fellows * generic/tclFCmd.c (TclFileAttrsCmd): Ensure that any reference to diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index d5c6e9c..139b8f2 100755 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.c @@ -2668,7 +2668,7 @@ StrictQuickFormat(double d, /* Number to convert */ */ inline static char* -QuickConversion(double d, /* Number to format */ +QuickConversion(double e, /* Number to format */ int k, /* floor(log10(d)), approximately */ int k_check, /* 0 if k is exact, 1 if it may be too high */ int flags, /* Flags passed to dtoa: @@ -2686,11 +2686,13 @@ QuickConversion(double d, /* Number to format */ char* retval; /* Returned string */ char* end; /* Pointer to the terminal null byte in the * returned string */ + volatile double d; /* Workaround for a bug in mingw gcc 3.4.5 */ /* * Bring d into the range [1 .. 10) */ - ieps = AdjustRange(&d, k); + ieps = AdjustRange(&e, k); + d = e; /* * If the guessed value of k didn't get d into range, adjust it -- cgit v0.12