From bf423bcae3ba7be2e916498f9f50ebb1e903d13a Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 13 Mar 2008 20:29:36 +0000 Subject: merge updates from HEAD --- ChangeLog | 14 ++++++++++++++ changes | 9 +++++++-- generic/tclStrToD.c | 18 +++++++++--------- unix/configure | 20 ++++++++++---------- unix/configure.in | 22 +++++++++++----------- unix/tcl.m4 | 16 ++++++++-------- 6 files changed, 59 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dcf90a..dc0af21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-03-13 Daniel Steffen + + * unix/configure.in: use backslash-quoting instead of double-quoting + * unix/tcl.m4: for lib paths in tclConfig.sh [Bug 1913622]. + * unix/configure: autoconf-2.59 + +2008-03-13 Don Porter + + * changes: Updated for 8.5.2 release. + + * generic/tclStrToD.c: Resolve identifier conflict over "pow10" + with libm in Cygwin and DJGPP. Thanks to Gordon Schumacher and + Philip Moore. [Patch 1800636] + 2008-03-12 Daniel Steffen * macosx/Tcl.xcodeproj/project.pbxproj: add support for Xcode 3.1 diff --git a/changes b/changes index f8fae37..5619efd 100644 --- a/changes +++ b/changes @@ -1,6 +1,6 @@ Recent user-visible changes to Tcl: -RCS: @(#) $Id: changes,v 1.116.2.10 2008/03/10 19:33:12 dgp Exp $ +RCS: @(#) $Id: changes,v 1.116.2.11 2008/03/13 20:29:36 dgp Exp $ 1. No more [command1] [command2] construct for grouping multiple commands on a single command line. @@ -7166,4 +7166,9 @@ and Tcl_AddObjToErrorInfo() (spjuth,porter) 2008-03-10 (bug fix)[1901113] crash in [tcl::Bgerror {} {}] (madden,porter) ---- Released 8.5.2, March 14, 2008 --- See ChangeLog for details --- +2008-03-11 (bug fix)[1911919] unset trace inf loop in namespace delete (sofer) + +2008-03-12 (new feature) some HTTP 1.1 support in http (and more!) (hobbs) +=> http 2.7 + +--- Released 8.5.2, March 18, 2008 --- See ChangeLog for details --- diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index 2b03227..25202a5 100755 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStrToD.c,v 1.30.2.1 2007/11/21 06:30:54 dgp Exp $ + * RCS: @(#) $Id: tclStrToD.c,v 1.30.2.2 2008/03/13 20:29:37 dgp Exp $ * *---------------------------------------------------------------------- */ @@ -83,7 +83,7 @@ static int maxpow10_wide; /* The powers of ten that can be represented * exactly as wide integers. */ static Tcl_WideUInt *pow10_wide; #define MAXPOW 22 -static double pow10[MAXPOW+1]; /* The powers of ten that can be represented +static double pow10vals[MAXPOW+1]; /* The powers of ten that can be represented * exactly as IEEE754 doubles. */ static int mmaxpow; /* Largest power of ten that can be * represented exactly in a 'double'. */ @@ -1323,7 +1323,7 @@ MakeLowPrecisionDouble( * without special handling. */ - retval = (double)(Tcl_WideInt)significand * pow10[ exponent ]; + retval = (double)(Tcl_WideInt)significand * pow10vals[ exponent ]; goto returnValue; } else { int diff = DBL_DIG - numSigDigs; @@ -1336,8 +1336,8 @@ MakeLowPrecisionDouble( */ volatile double factor = - (double)(Tcl_WideInt)significand * pow10[diff]; - retval = factor * pow10[exponent-diff]; + (double)(Tcl_WideInt)significand * pow10vals[diff]; + retval = factor * pow10vals[exponent-diff]; goto returnValue; } } @@ -1349,7 +1349,7 @@ MakeLowPrecisionDouble( * only one rounding. */ - retval = (double)(Tcl_WideInt)significand / pow10[-exponent]; + retval = (double)(Tcl_WideInt)significand / pow10vals[-exponent]; goto returnValue; } } @@ -2178,7 +2178,7 @@ TclInitDoubleConversion(void) mmaxpow = MAXPOW; } for (i=0 ; i<=mmaxpow ; ++i) { - pow10[i] = d; + pow10vals[i] = d; d *= 10.0; } @@ -2571,7 +2571,7 @@ Pow10TimesFrExp( * Multiply by 10**exponent */ - retval = frexp(retval * pow10[exponent&0xf], &j); + retval = frexp(retval * pow10vals[exponent&0xf], &j); expt += j; for (i=4; i<9; ++i) { if (exponent & (1<