[Python-checkins] cpython (merge 3.3 -> default): Fix compilation on Windows

[christian.heimes]

http://hg.python.org/cpython/rev/23e2682a2096
changeset:   80228:23e2682a2096
parent:      80225:bc8e6301cfc2
parent:      80227:c69f9dcae45b
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Nov 03 23:08:27 2012 +0100
summary:
  Fix compilation on Windows

files:
  Objects/bytearrayobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -589,6 +589,7 @@
         needed = 0;
     }
     else if (values == (PyObject *)self || !PyByteArray_Check(values)) {
+        int err;
         if (PyNumber_Check(values) || PyUnicode_Check(values)) {
             PyErr_SetString(PyExc_TypeError,
                             "can assign only bytes, buffers, or iterables "
@@ -596,7 +597,6 @@
             return -1;
         }
         /* Make a copy and call this function recursively */
-        int err;
         values = PyByteArray_FromObject(values);
         if (values == NULL)
             return -1;

-- 
Repository URL: http://hg.python.org/cpython