Merged revisions 75441 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75441 | mark.dickinson | 2009-10-15 20:55:18 +0100 (Thu, 15 Oct 2009) | 9 lines
Merged revisions 75440 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75440 | mark.dickinson | 2009-10-15 18:45:39 +0100 (Thu, 15 Oct 2009) | 1 line
Allow core Python build to succeed under WITHOUT_COMPLEX. The module build stage still fails.
........
................
diff --git a/Python/compile.c b/Python/compile.c
index 23722b2..1a12b42 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -909,10 +909,8 @@
{
PyObject *t, *v;
Py_ssize_t arg;
- unsigned char *p, *q;
- Py_complex z;
+ unsigned char *p;
double d;
- int real_part_zero, imag_part_zero;
/* necessary to make sure types aren't coerced (e.g., int and long) */
/* _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms */
@@ -927,7 +925,11 @@
else
t = PyTuple_Pack(2, o, o->ob_type);
}
+#ifndef WITHOUT_COMPLEX
else if (PyComplex_Check(o)) {
+ Py_complex z;
+ int real_part_zero, imag_part_zero;
+ unsigned char *q;
/* complex case is even messier: we need to make complex(x,
0.) different from complex(x, -0.) and complex(0., y)
different from complex(-0., y), for any x and y. In
@@ -957,6 +959,7 @@
t = PyTuple_Pack(2, o, o->ob_type);
}
}
+#endif /* WITHOUT_COMPLEX */
else {
t = PyTuple_Pack(2, o, o->ob_type);
}
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index c350907..79cb5f9 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -9,6 +9,8 @@
#define FORMAT_STRING _PyUnicode_FormatAdvanced
#define FORMAT_LONG _PyLong_FormatAdvanced
#define FORMAT_FLOAT _PyFloat_FormatAdvanced
+#ifndef WITHOUT_COMPLEX
#define FORMAT_COMPLEX _PyComplex_FormatAdvanced
+#endif
#include "../Objects/stringlib/formatter.h"