[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/85cb7c37503e
changeset:   89667:85cb7c37503e
parent:      89664:586de8d96817
parent:      89666:3f93907ab8e1
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Mar 15 11:50:14 2014 -0500
summary:
  merge 3.3

files:
  Modules/_decimal/_decimal.c |  3 ---
  Modules/_math.c             |  2 ++
  2 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -3928,9 +3928,6 @@
     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
--- 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 :

-- 
Repository URL: http://hg.python.org/cpython