[Python-checkins] r75811 - in python/branches/release26-maint: Python/compile.c

[mark.dickinson]

Author: mark.dickinson
Date: Tue Oct 27 18:26:31 2009
New Revision: 75811

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/release26-maint/   (props changed)
   python/branches/release26-maint/Python/compile.c

Modified: python/branches/release26-maint/Python/compile.c
==============================================================================
--- python/branches/release26-maint/Python/compile.c	(original)
+++ python/branches/release26-maint/Python/compile.c	Tue Oct 27 18:26:31 2009
@@ -922,10 +922,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 */
@@ -940,7 +938,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
@@ -970,6 +972,7 @@
 			t = PyTuple_Pack(2, o, o->ob_type);
 		}
         }
+#endif /* WITHOUT_COMPLEX */
 	else {
 		t = PyTuple_Pack(2, o, o->ob_type);
         }