summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-08-22 19:38:45 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-08-22 19:38:45 (GMT)
commit6144bee2289587271ecc036c760f4ba6aa48940b (patch)
treee7dbc87de47bb92537877e718d88b662a9054697
parentffeef9044e88b7189ddd358c803b8f682206ceaa (diff)
downloadcpython-6144bee2289587271ecc036c760f4ba6aa48940b.zip
cpython-6144bee2289587271ecc036c760f4ba6aa48940b.tar.gz
cpython-6144bee2289587271ecc036c760f4ba6aa48940b.tar.bz2
Merged revisions 65975 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65975 | christian.heimes | 2008-08-22 21:34:15 +0200 (Fri, 22 Aug 2008) | 1 line Changed type of numarenas from uint to size_t to silence a GCC warning on 64bit OSes. Reviewed by Benjamin Peterson. ........
-rw-r--r--Objects/obmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index da8f9c2..b4ad60a 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -517,7 +517,7 @@ new_arena(void)
#endif
if (unused_arena_objects == NULL) {
uint i;
- uint numarenas;
+ size_t numarenas;
size_t nbytes;
/* Double the number of arena objects on each allocation.