merge 3.3

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)
 {

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 :