commit eda95e9db3e15ebc19979eab948a75272d8cbdcf
author Antoine Pitrou <solipsis@pitrou.net> Mon Oct 19 19:47:59 2009 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Mon Oct 19 19:47:59 2009 +0000
tree 9e374c5cf279d600943f57543adccf902b6d5c09
parent bc740a6951b2d234fc69936c7ff4713a503f20cf

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.
........

Modules/_localemodule.c

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 @@
 
 ******************************************************************/
 
+#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include <stdio.h>
@@ -315,7 +316,7 @@
     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;