Index: apr/atomic/unix/mutex.c
===================================================================
--- apr.orig/atomic/unix/mutex.c
+++ apr/atomic/unix/mutex.c
@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_atomic_ini
     return APR_SUCCESS;
 }
 
-static APR_INLINE apr_thread_mutex_t *mutex_hash(volatile apr_uint32_t *mem)
+static APR_INLINE apr_thread_mutex_t *mutex_hash(apr_uint32_t *mem)
 {
     apr_thread_mutex_t *mutex = hash_mutex[ATOMIC_HASH(mem)];
 
@@ -93,12 +93,12 @@ APR_DECLARE(apr_status_t) apr_atomic_ini
 
 #endif /* APR_HAS_THREADS */
 
-APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(apr_uint32_t *mem)
 {
     return *mem;
 }
 
-APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(void) apr_atomic_set32(apr_uint32_t *mem, apr_uint32_t val)
 {
     DECLARE_MUTEX_LOCKED(mutex, mem);
 
@@ -107,7 +107,7 @@ APR_DECLARE(void) apr_atomic_set32(volat
     MUTEX_UNLOCK(mutex);
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t old_value;
     DECLARE_MUTEX_LOCKED(mutex, mem);
@@ -120,19 +120,19 @@ APR_DECLARE(apr_uint32_t) apr_atomic_add
     return old_value;
 }
 
-APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(void) apr_atomic_sub32(apr_uint32_t *mem, apr_uint32_t val)
 {
     DECLARE_MUTEX_LOCKED(mutex, mem);
     *mem -= val;
     MUTEX_UNLOCK(mutex);
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(apr_uint32_t *mem)
 {
     return apr_atomic_add32(mem, 1);
 }
 
-APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+APR_DECLARE(int) apr_atomic_dec32(apr_uint32_t *mem)
 {
     apr_uint32_t new;
     DECLARE_MUTEX_LOCKED(mutex, mem);
@@ -145,8 +145,8 @@ APR_DECLARE(int) apr_atomic_dec32(volati
     return new;
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
-                              apr_uint32_t cmp)
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
 {
     apr_uint32_t prev;
     DECLARE_MUTEX_LOCKED(mutex, mem);
@@ -161,7 +161,7 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas
     return prev;
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(apr_uint32_t *mem, apr_uint32_t val)
 {
     apr_uint32_t prev;
     DECLARE_MUTEX_LOCKED(mutex, mem);
@@ -174,7 +174,7 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xch
     return prev;
 }
 
-APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+APR_DECLARE(void*) apr_atomic_casptr(void **mem, void *with, void *cmp)
 {
     void *prev;
     DECLARE_MUTEX_LOCKED(mutex, *mem);