Py_complex; and WITHOUT_COMPLEX added to getargs.c
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 0eedb65..3a3fe56 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -286,7 +286,7 @@
{
object *r, *i;
number_methods *nbr, *nbi;
- complex cr, ci;
+ Py_complex cr, ci;
i = NULL;
if (!newgetargs(args, "O|O:complex", &r, &i))
diff --git a/Python/compile.c b/Python/compile.c
index 3a1d3f6..3299ad9 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -565,7 +565,7 @@
char *end;
long x;
#ifndef WITHOUT_COMPLEX
- complex c;
+ Py_complex c;
int imflag;
#endif
@@ -2500,7 +2500,7 @@
name = STR(fp);
else {
name = "";
- complex= 1;
+ complex = 1;
}
com_newlocal(c, name);
c->c_argcount++;
diff --git a/Python/getargs.c b/Python/getargs.c
index 7ec31c3..0c47614 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -498,16 +498,18 @@
break;
}
+#ifndef WITHOUT_COMPLEX
case 'D': /* complex double */
{
- complex *p = va_arg(*p_va, complex *);
- complex cval = PyComplex_AsCComplex(arg);
+ Py_complex *p = va_arg(*p_va, Py_complex *);
+ Py_complex cval = PyComplex_AsCComplex(arg);
if (err_occurred())
return "complex<D>";
else
*p = cval;
break;
}
+#endif /* WITHOUT_COMPLEX */
case 'c': /* char */
{
diff --git a/Python/marshal.c b/Python/marshal.c
index 2fab46f..509e303 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -359,7 +359,7 @@
{
extern double atof PROTO((const char *));
char buf[256];
- complex c;
+ Py_complex c;
n = r_byte(p);
if (r_string(buf, (int)n, p) != n) {
err_setstr(EOFError,