diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-03-15 16:50:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-03-15 16:50:14 (GMT) |
| commit | 466eaaa5d107d0adcfc194d5d94e346a6b807c9d (patch) | |
| tree | c7d88425dbb58a655cc55123f9ad5e59d4a39095 /Modules | |
| parent | d3b3bba2ede328fa537022c7608332f4782395cd (diff) | |
| parent | c77e7a4f233453a4e39fc7f61c72e6ef3877dcd1 (diff) | |
| download | cpython-466eaaa5d107d0adcfc194d5d94e346a6b807c9d.zip cpython-466eaaa5d107d0adcfc194d5d94e346a6b807c9d.tar.gz cpython-466eaaa5d107d0adcfc194d5d94e346a6b807c9d.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_decimal/_decimal.c | 3 | ||||
| -rw-r--r-- | Modules/_math.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c index ac20308..ea5253e 100644 --- a/Modules/_decimal/_decimal.c +++ b/Modules/_decimal/_decimal.c @@ -3928,9 +3928,6 @@ nm_mpd_qdivmod(PyObject *v, PyObject *w) return ret; } -static mpd_uint_t data_zero[1] = {0}; -static const mpd_t zero = {MPD_STATIC|MPD_CONST_DATA, 0, 1, 1, 1, data_zero}; - static PyObject * nm_mpd_qpow(PyObject *base, PyObject *exp, PyObject *mod) { diff --git a/Modules/_math.c b/Modules/_math.c index fe75a36..a14ff06 100644 --- a/Modules/_math.c +++ b/Modules/_math.c @@ -22,7 +22,9 @@ static const double ln2 = 6.93147180559945286227E-01; static const double two_pow_m28 = 3.7252902984619141E-09; /* 2**-28 */ static const double two_pow_p28 = 268435456.0; /* 2**28 */ +#ifndef Py_NAN static const double zero = 0.0; +#endif /* acosh(x) * Method : |