From 26d8fbd945451134d1527e2367c436e01395e0c6 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Thu, 15 Oct 2009 19:55:18 +0000 Subject: 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. ........ --- Python/formatter_unicode.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Python/formatter_unicode.c') diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index c350907da1..79cb5f9192 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" -- cgit v1.2.1 From e4216a84485c97ae3ff3c9fcd27feba89513fc27 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Sun, 18 Oct 2009 16:41:32 +0000 Subject: Remove the uses of WITHOUT_COMPLEX introduced in r75471 --- Python/formatter_unicode.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'Python/formatter_unicode.c') diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index 79cb5f9192..c350907da1 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" -- cgit v1.2.1