Index: apr/atomic/os390/atomic.c =================================================================== --- apr.orig/atomic/os390/atomic.c +++ apr/atomic/os390/atomic.c @@ -25,7 +25,7 @@ apr_status_t apr_atomic_init(apr_pool_t return APR_SUCCESS; } -apr_uint32_t apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val) +apr_uint32_t apr_atomic_add32(apr_uint32_t *mem, apr_uint32_t val) { apr_uint32_t old, new_val; @@ -36,7 +36,7 @@ apr_uint32_t apr_atomic_add32(volatile a return old; } -void apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val) +void apr_atomic_sub32(apr_uint32_t *mem, apr_uint32_t val) { apr_uint32_t old, new_val; @@ -46,12 +46,12 @@ void apr_atomic_sub32(volatile apr_uint3 } while (__cs(&old, (cs_t *)mem, new_val)); } -apr_uint32_t apr_atomic_inc32(volatile apr_uint32_t *mem) +apr_uint32_t apr_atomic_inc32(apr_uint32_t *mem) { return apr_atomic_add32(mem, 1); } -int apr_atomic_dec32(volatile apr_uint32_t *mem) +int apr_atomic_dec32(apr_uint32_t *mem) { apr_uint32_t old, new_val; @@ -63,17 +63,17 @@ int apr_atomic_dec32(volatile apr_uint32 return new_val != 0; } -apr_uint32_t apr_atomic_read32(volatile apr_uint32_t *mem) +apr_uint32_t apr_atomic_read32(apr_uint32_t *mem) { return *mem; } -void apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val) +void apr_atomic_set32(apr_uint32_t *mem, apr_uint32_t val) { *mem = val; } -apr_uint32_t apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t swap, +apr_uint32_t apr_atomic_cas32(apr_uint32_t *mem, apr_uint32_t swap, apr_uint32_t cmp) { apr_uint32_t old = cmp; @@ -82,7 +82,7 @@ apr_uint32_t apr_atomic_cas32(volatile a return old; /* old is automatically updated from mem on cs failure */ } -apr_uint32_t apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val) +apr_uint32_t apr_atomic_xchg32(apr_uint32_t *mem, apr_uint32_t val) { apr_uint32_t old, new_val;