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

Sat Nov 3 23:09:24 CET 2012

http://hg.python.org/cpython/rev/c69f9dcae45b
changeset: 80227:c69f9dcae45b
branch: 3.3
parent: 80224:95ea024f0569
parent: 80226:d8c47e199297
user: Christian Heimes <christian at cheimes.de>
date: Sat Nov 03 23:08:18 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
