@@ -760,7 +760,7 @@ struct arena_object {
760760 * here to mark an arena_object that doesn't correspond to an
761761 * allocated arena.
762762 */
763- uinptr_t address ;
763+ uintptr_t address ;
764764
765765 /* Pool-aligned pointer to the next pool to be carved off. */
766766 block * pool_address ;
@@ -1091,7 +1091,7 @@ new_arena(void)
10911091 unused_arena_objects = arenaobj ;
10921092 return NULL ;
10931093 }
1094- arenaobj -> address = (uinptr_t )address ;
1094+ arenaobj -> address = (uintptr_t )address ;
10951095
10961096 ++ narenas_currently_allocated ;
10971097 ++ ntimes_arena_allocated ;
@@ -1198,7 +1198,7 @@ address_in_range(void *p, poolp pool)
11981198 // only once.
11991199 uint arenaindex = * ((volatile uint * )& pool -> arenaindex );
12001200 return arenaindex < maxarenas &&
1201- (uinptr_t )p - arenas [arenaindex ].address < ARENA_SIZE &&
1201+ (uintptr_t )p - arenas [arenaindex ].address < ARENA_SIZE &&
12021202 arenas [arenaindex ].address != 0 ;
12031203}
12041204
@@ -2287,25 +2287,25 @@ _PyObject_DebugMallocStats(FILE *out)
22872287 */
22882288 for (i = 0 ; i < maxarenas ; ++ i ) {
22892289 uint j ;
2290- uinptr_t base = arenas [i ].address ;
2290+ uintptr_t base = arenas [i ].address ;
22912291
22922292 /* Skip arenas which are not allocated. */
2293- if (arenas [i ].address == (uinptr_t )NULL )
2293+ if (arenas [i ].address == (uintptr_t )NULL )
22942294 continue ;
22952295 narenas += 1 ;
22962296
22972297 numfreepools += arenas [i ].nfreepools ;
22982298
22992299 /* round up to pool alignment */
2300- if (base & (uinptr_t )POOL_SIZE_MASK ) {
2300+ if (base & (uintptr_t )POOL_SIZE_MASK ) {
23012301 arena_alignment += POOL_SIZE ;
2302- base &= ~(uinptr_t )POOL_SIZE_MASK ;
2302+ base &= ~(uintptr_t )POOL_SIZE_MASK ;
23032303 base += POOL_SIZE ;
23042304 }
23052305
23062306 /* visit every pool in the arena */
2307- assert (base <= (uinptr_t ) arenas [i ].pool_address );
2308- for (j = 0 ; base < (uinptr_t ) arenas [i ].pool_address ;
2307+ assert (base <= (uintptr_t ) arenas [i ].pool_address );
2308+ for (j = 0 ; base < (uintptr_t ) arenas [i ].pool_address ;
23092309 ++ j , base += POOL_SIZE ) {
23102310 poolp p = (poolp )base ;
23112311 const uint sz = p -> szidx ;
0 commit comments