diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-05 16:05:36 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-06-05 16:05:36 (GMT) |
| commit | e6d8763bc8e167637a136b863e0728665471eff3 (patch) | |
| tree | dcd63dcfb36e95741a3c4c89b7a852034b2a9011 /generic | |
| parent | c69794cc05d5ab01537ede052537fa25613c01c4 (diff) | |
| parent | 7d602745337ea00ec3bd5cbb4efcd1c0e3379fbb (diff) | |
| download | tcl-e6d8763bc8e167637a136b863e0728665471eff3.zip tcl-e6d8763bc8e167637a136b863e0728665471eff3.tar.gz tcl-e6d8763bc8e167637a136b863e0728665471eff3.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 2 | ||||
| -rwxr-xr-x | generic/tclStrToD.c | 3 | ||||
| -rw-r--r-- | generic/tclZlib.c | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index e09ea1e..b38558a 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -81,8 +81,6 @@ TCL_DECLARE_MUTEX(cancelLock) * are used to save the evaluation state between NR calls to each coro. */ -static const CorContext NULL_CONTEXT = {NULL, NULL, NULL, NULL}; - #define SAVE_CONTEXT(context) \ (context).framePtr = iPtr->framePtr; \ (context).varFramePtr = iPtr->varFramePtr; \ diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c index 332cfca..2d534a68 100755 --- a/generic/tclStrToD.c +++ b/generic/tclStrToD.c @@ -192,8 +192,6 @@ static int maxDigits; /* The maximum number of digits to the left of * the decimal point of a double. */ static int minDigits; /* The maximum number of digits to the right * of the decimal point in a double. */ -static int mantDIGIT; /* Number of mp_digit's needed to hold the - * significand of a double. */ static const double pow_10_2_n[] = { /* Inexact higher powers of ten. */ 1.0, 100.0, @@ -4425,7 +4423,6 @@ TclInitDoubleConversion(void) + 0.5 * log(10.)) / log(10.)); minDigits = (int) floor((DBL_MIN_EXP - DBL_MANT_DIG) * log((double) FLT_RADIX) / log(10.)); - mantDIGIT = (mantBits + DIGIT_BIT-1) / DIGIT_BIT; log10_DIGIT_MAX = (int) floor(DIGIT_BIT * log(2.) / log(10.)); /* diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 09cddcc..16bed47 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -612,6 +612,7 @@ Tcl_ZlibStreamInit( zshPtr->flags = 0; zshPtr->gzHeaderPtr = gzHeaderPtr; memset(&zshPtr->stream, 0, sizeof(z_stream)); + zshPtr->stream.adler = 1; /* * No output buffer available yet |