diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:47:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:47:59 (GMT) |
| commit | eda95e9db3e15ebc19979eab948a75272d8cbdcf (patch) | |
| tree | 9e374c5cf279d600943f57543adccf902b6d5c09 /Modules | |
| parent | bc740a6951b2d234fc69936c7ff4713a503f20cf (diff) | |
| download | cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.zip cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.tar.gz cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.tar.bz2 | |
Merged revisions 75537,75539 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r75537 | antoine.pitrou | 2009-10-19 21:37:25 +0200 (lun., 19 oct. 2009) | 3 lines
egreen is Derk Drukker + fix NEWS formatting
........
r75539 | antoine.pitrou | 2009-10-19 21:43:09 +0200 (lun., 19 oct. 2009) | 4 lines
Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows
platforms, and assorted locale fixes by Derk Drukker.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_localemodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 8bcdb10..d90a49d 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -9,6 +9,7 @@ This software comes with no warranty. Use at your own risk. ******************************************************************/ +#define PY_SSIZE_T_CLEAN #include "Python.h" #include <stdio.h> @@ -315,7 +316,7 @@ PyLocale_strxfrm(PyObject* self, PyObject* args) result = PyUnicode_FromWideChar(buf, n2); exit: if (buf) PyMem_Free(buf); -#ifdef HAVE_USABLE_WCHAR_T +#ifndef HAVE_USABLE_WCHAR_T PyMem_Free(s); #endif return result; |