X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2Fboehm-gc%2Flibatomic_ops-1.2%2Fsrc%2Fatomic_ops%2Fsysdeps%2Fao_t_is_int.h;h=c7803c5b7c015efd439f35d24be909bcda7c0e19;hb=c83bff94e40ee0a218a39931af17814d1a42cb5c;hp=18156c81fd120bdffbe4eb0ea6da8731d34daa25;hpb=c1ce9643c18b5f133568529fdf19e21e06bc2adc;p=cacao.git

diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ao_t_is_int.h b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ao_t_is_int.h
index 18156c81f..c7803c5b7 100644
--- a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ao_t_is_int.h
+++ b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ao_t_is_int.h
@@ -31,96 +31,97 @@
 #if defined(AO_HAVE_compare_and_swap_full) && \
     !defined(AO_HAVE_int_compare_and_swap_full)
 #  define AO_int_compare_and_swap_full(addr, old, new_val) \
-		AO_compare_and_swap_full((volatile AO_t *)addr, \
-				         (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap_full((volatile AO_t *)(addr), \
+		         		(AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap_full
 # endif
 
 #if defined(AO_HAVE_compare_and_swap_acquire) && \
     !defined(AO_HAVE_int_compare_and_swap_acquire)
 #  define AO_int_compare_and_swap_acquire(addr, old, new_val) \
-		AO_compare_and_swap_acquire((volatile AO_t *)addr, \
-				            (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap_acquire((volatile AO_t *)(addr), \
+				            (AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap_acquire
 # endif
 
 #if defined(AO_HAVE_compare_and_swap_release) && \
     !defined(AO_HAVE_int_compare_and_swap_release)
 #  define AO_int_compare_and_swap_release(addr, old, new_val) \
-		AO_compare_and_swap_release((volatile AO_t *)addr, \
-				         (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap_release((volatile AO_t *)(addr), \
+				         (AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap_release
 # endif
 
 #if defined(AO_HAVE_compare_and_swap_write) && \
     !defined(AO_HAVE_int_compare_and_swap_write)
 #  define AO_int_compare_and_swap_write(addr, old, new_val) \
-		AO_compare_and_swap_write((volatile AO_t *)addr, \
-				          (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap_write((volatile AO_t *)(addr), \
+				          (AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap_write
 # endif
 
 #if defined(AO_HAVE_compare_and_swap_read) && \
     !defined(AO_HAVE_int_compare_and_swap_read)
 #  define AO_int_compare_and_swap_read(addr, old, new_val) \
-		AO_compare_and_swap_read((volatile AO_t *)addr, \
-				         (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap_read((volatile AO_t *)(addr), \
+				         (AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap_read
 # endif
 
 #if defined(AO_HAVE_compare_and_swap) && \
     !defined(AO_HAVE_int_compare_and_swap)
 #  define AO_int_compare_and_swap(addr, old, new_val) \
-		AO_compare_and_swap((volatile AO_t *)addr, \
-				    (AO_t) old, (AO_t)new_val)
+		AO_compare_and_swap((volatile AO_t *)(addr), \
+				    (AO_t)(old), (AO_t)(new_val))
 #  define AO_HAVE_int_compare_and_swap
 # endif
 
 #if defined(AO_HAVE_load_acquire) && \
     !defined(AO_HAVE_int_load_acquire)
-#  define AO_int_load_acquire(addr) (int)AO_load_acquire((volatile AO_t *)addr)
+#  define AO_int_load_acquire(addr) \
+	(int)AO_load_acquire((const volatile AO_t *)(addr))
 #  define AO_HAVE_int_load_acquire
 # endif
 
 #if defined(AO_HAVE_store_release) && \
     !defined(AO_HAVE_int_store_release)
 #  define AO_int_store_release(addr, val) \
-	AO_store_release((volatile AO_t *)addr, (AO_t)val)
+	AO_store_release((volatile AO_t *)(addr), (AO_t)(val))
 #  define AO_HAVE_int_store_release
 # endif
 
 #if defined(AO_HAVE_fetch_and_add_full) && \
     !defined(AO_HAVE_int_fetch_and_add_full)
 #  define AO_int_fetch_and_add_full(addr, incr) \
-	(int)AO_fetch_and_add_full((volatile AO_t *)addr, (AO_t)incr)
+	(int)AO_fetch_and_add_full((volatile AO_t *)(addr), (AO_t)(incr))
 #  define AO_HAVE_int_fetch_and_add_full
 # endif
 
 #if defined(AO_HAVE_fetch_and_add1_acquire) && \
     !defined(AO_HAVE_int_fetch_and_add1_acquire)
 #  define AO_int_fetch_and_add1_acquire(addr) \
-	(int)AO_fetch_and_add1_acquire((volatile AO_t *)addr)
+	(int)AO_fetch_and_add1_acquire((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_add1_acquire
 # endif
 
 #if defined(AO_HAVE_fetch_and_add1_release) && \
     !defined(AO_HAVE_int_fetch_and_add1_release)
 #  define AO_int_fetch_and_add1_release(addr) \
-	(int)AO_fetch_and_add1_release((volatile AO_t *)addr)
+	(int)AO_fetch_and_add1_release((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_add1_release
 # endif
 
 #if defined(AO_HAVE_fetch_and_sub1_acquire) && \
     !defined(AO_HAVE_int_fetch_and_sub1_acquire)
 #  define AO_int_fetch_and_sub1_acquire(addr) \
-	(int)AO_fetch_and_sub1_acquire((volatile AO_t *)addr)
+	(int)AO_fetch_and_sub1_acquire((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_sub1_acquire
 # endif
 
 #if defined(AO_HAVE_fetch_and_sub1_release) && \
     !defined(AO_HAVE_int_fetch_and_sub1_release)
 #  define AO_int_fetch_and_sub1_release(addr) \
-	(int)AO_fetch_and_sub1_release((volatile AO_t *)addr)
+	(int)AO_fetch_and_sub1_release((volatile AO_t *)(addr))
 #  define AO_HAVE_int_fetch_and_sub1_release
 # endif