complex_subtype_from_string(): move the declaration of s_buffer[] out

of the if block where it was before.  The name is only used inside
that if block, but the storage is referenced outside it via the 's'
variable.

(This patch was part of SF patch #474590 -- RISC OS support.)

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index 675d5b512aa43869fdcb299ba857d06ab63d383f..68d842ea4f3b1fca79b6eaa7fd7540c6728c4343 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -646,6 +646,9 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
        int sw_error=0;
        int sign;
        char buffer[256]; /* For errors */
+#ifdef Py_USING_UNICODE
+       char s_buffer[256];
+#endif
        int len;
 
        if (PyString_Check(v)) {
@@ -654,7 +657,6 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
        }
 #ifdef Py_USING_UNICODE
        else if (PyUnicode_Check(v)) {
-               char s_buffer[256];
                if (PyUnicode_GET_SIZE(v) >= sizeof(s_buffer)) {
                        PyErr_SetString(PyExc_ValueError,
                                 "complex() literal too large to convert");