[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#17228)

[benjamin.peterson]

http://hg.python.org/cpython/rev/ea4a36c667ce
changeset:   82284:ea4a36c667ce
parent:      82281:cf0b7d3e5fc6
parent:      82282:470350fd2831
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Feb 20 16:56:06 2013 -0500
summary:
  merge 3.3 (#17228)

files:
  Misc/NEWS          |  2 ++
  Objects/obmalloc.c |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -940,6 +940,8 @@
 Build
 -----
 
+- Issue #17228: Fix building without pymalloc.
+
 - Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
 
 - Issue #16235: Implement python-config as a shell script.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1763,7 +1763,7 @@
     k = 3;
     do {
         size_t nextvalue = value / 10;
-        uint digit = (uint)(value - nextvalue * 10);
+        unsigned int digit = (unsigned int)(value - nextvalue * 10);
         value = nextvalue;
         buf[i--] = (char)(digit + '0');
         --k;

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