[Python-checkins] r75441 - in python/branches/py3k: Python/compile.c Python/formatter_unicode.c
mark.dickinson
python-checkins at python.org
Thu Oct 15 21:55:18 CEST 2009
Author: mark.dickinson
Date: Thu Oct 15 21:55:18 2009
New Revision: 75441
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Python/compile.c
python/branches/py3k/Python/formatter_unicode.c
Modified: python/branches/py3k/Python/compile.c
==============================================================================
--- python/branches/py3k/Python/compile.c (original)
+++ python/branches/py3k/Python/compile.c Thu Oct 15 21:55:18 2009
@@ -895,10 +895,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 */
@@ -913,7 +911,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
@@ -943,6 +945,7 @@
t = PyTuple_Pack(2, o, o->ob_type);
}
}
+#endif /* WITHOUT_COMPLEX */
else {
t = PyTuple_Pack(2, o, o->ob_type);
}
Modified: python/branches/py3k/Python/formatter_unicode.c
==============================================================================
--- python/branches/py3k/Python/formatter_unicode.c (original)
+++ python/branches/py3k/Python/formatter_unicode.c Thu Oct 15 21:55:18 2009
@@ -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"
More information about the Python-checkins
mailing list