@@ -863,20 +863,22 @@ test_spinlock(void)
863863 */
864864#ifndef HAVE_SPINLOCKS
865865{
866+ uint32 i ;
867+
866868/*
867869 * Initialize enough spinlocks to advance counter close to
868870 * wraparound. It's too expensive to perform acquire/release for each,
869871 * as those may be syscalls when the spinlock emulation is used (and
870872 * even just atomic TAS would be expensive).
871873 */
872- for (uint32 i = 0 ;i < INT32_MAX - 100000 ;i ++ )
874+ for (i = 0 ;i < INT32_MAX - 100000 ;i ++ )
873875{
874876slock_t lock ;
875877
876878SpinLockInit (& lock );
877879}
878880
879- for (uint32 i = 0 ;i < 200000 ;i ++ )
881+ for (i = 0 ;i < 200000 ;i ++ )
880882{
881883slock_t lock ;
882884
@@ -912,25 +914,26 @@ test_atomic_spin_nest(void)
912914#define NUM_TEST_ATOMICS (NUM_SPINLOCK_SEMAPHORES + NUM_ATOMICS_SEMAPHORES + 27)
913915pg_atomic_uint32 atomics32 [NUM_TEST_ATOMICS ];
914916pg_atomic_uint64 atomics64 [NUM_TEST_ATOMICS ];
917+ int i ;
915918
916919SpinLockInit (& lock );
917920
918- for (int i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
921+ for (i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
919922{
920923pg_atomic_init_u32 (& atomics32 [i ],0 );
921924pg_atomic_init_u64 (& atomics64 [i ],0 );
922925}
923926
924927/* just so it's not all zeroes */
925- for (int i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
928+ for (i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
926929{
927930EXPECT_EQ_U32 (pg_atomic_fetch_add_u32 (& atomics32 [i ],i ),0 );
928931EXPECT_EQ_U64 (pg_atomic_fetch_add_u64 (& atomics64 [i ],i ),0 );
929932}
930933
931934/* test whether we can do atomic op with lock held */
932935SpinLockAcquire (& lock );
933- for (int i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
936+ for (i = 0 ;i < NUM_TEST_ATOMICS ;i ++ )
934937{
935938EXPECT_EQ_U32 (pg_atomic_fetch_sub_u32 (& atomics32 [i ],i ),i );
936939EXPECT_EQ_U32 (pg_atomic_read_u32 (& atomics32 [i ]),0 );