diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-02-20 16:56:06 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-02-20 16:56:06 -0500 |
| commit | abe40c252869264ff6cc42d3a91e38b3dad3b1b2 (patch) | |
| tree | 6c6ed2bc42a81501299132e70511439328249d32 | |
| parent | 92bd4ef640e749833a16b09705f546af9c18522c (diff) | |
| parent | 2dba1ee3e62f613f8fbf85b997601789fc8f80d1 (diff) | |
| download | cpython-git-abe40c252869264ff6cc42d3a91e38b3dad3b1b2.tar.gz | |
merge 3.3 (#17228)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/obmalloc.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -940,6 +940,8 @@ Tests 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 index bbe2805bd1..5943f5a6c3 100644 --- a/Objects/obmalloc.c +++ b/Objects/obmalloc.c @@ -1763,7 +1763,7 @@ printone(FILE *out, const char* msg, size_t value) 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; |