From: Mark Dickinson <dickinsm@gmail.com>
Date: Sun, 18 Oct 2009 16:41:32 +0000 (+0000)
Subject: Remove the uses of WITHOUT_COMPLEX introduced in r75471
X-Git-Tag: v3.2a1~2378
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01458c7a62cb3fc79e84e7326c5553e8143c4760;p=thirdparty%2FPython%2Fcpython.git

Remove the uses of WITHOUT_COMPLEX introduced in r75471
---

diff --git a/Python/compile.c b/Python/compile.c
index 081268bcacc5..2bb9beb3d8fe 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -911,7 +911,6 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 		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;
@@ -945,7 +944,6 @@ compiler_add_o(struct compiler *c, PyObject *dict, PyObject *o)
 			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 79cb5f919265..c350907da189 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -9,8 +9,6 @@
 #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"