From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 3 Oct 2011 02:06:05 +0000 (+0200)
Subject: Fix compilation error on Windows
X-Git-Tag: v3.3.0a1~1376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd82278cb11cf95cbf49afaab5e8ee920047eb5;p=thirdparty%2FPython%2Fcpython.git

Fix compilation error on Windows

Fix also a compiler warning.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ddfe566bcee0..4a7815394eb1 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -509,9 +509,10 @@ resize_copy(PyObject *unicode, Py_ssize_t length)
         }
         return copy;
     } else {
+        PyUnicodeObject *w;
         assert(_PyUnicode_WSTR(unicode) != NULL);
         assert(_PyUnicode_DATA_ANY(unicode) == NULL);
-        PyUnicodeObject *w = _PyUnicode_New(length);
+        w = _PyUnicode_New(length);
         if (w == NULL)
             return NULL;
         copy_length = _PyUnicode_WSTR_LENGTH(unicode);
@@ -6521,7 +6522,7 @@ decode_mbcs(PyUnicodeObject **v,
     else {
         /* Extend unicode object */
         n = PyUnicode_GET_SIZE(*v);
-        if (PyUnicode_Resize(v, n + usize) < 0)
+        if (PyUnicode_Resize((PyObject**)v, n + usize) < 0)
             return -1;
     }