boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[cacao.git] / src / mm / boehm-gc / libatomic_ops-1.2 / src / atomic_ops / generalize.h

diff --git a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/generalize.h b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/generalize.h
index bfcf2d7ba227a9ee6f47932e82a36a7874bc90c1..45950c7ab5e30c34d581fb3bda3899c46f3714d0 100644 (file)
--- a/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/generalize.h
+++ b/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/generalize.h
@@ -149,7 +149,7 @@
 
 #if defined(AO_HAVE_test_and_set_full) && !defined(AO_HAVE_nop_full)
    AO_INLINE void
-   AO_nop_full()
+   AO_nop_full(void)
    {
      AO_TS_t dummy = AO_TS_INITIALIZER;
      AO_test_and_set_full(&dummy);
@@ -198,7 +198,7 @@
 #if defined(AO_HAVE_load) && defined(AO_HAVE_nop_full) && \
     !defined(AO_HAVE_load_acquire)
    AO_INLINE AO_t
-   AO_load_acquire(volatile AO_t *addr)
+   AO_load_acquire(const volatile AO_t *addr)
    {
      AO_t result = AO_load(addr);
      /* Acquire barrier would be useless, since the load could be delayed  */
@@ -212,7 +212,7 @@
 #if defined(AO_HAVE_load) && defined(AO_HAVE_nop_read) && \
     !defined(AO_HAVE_load_read)
    AO_INLINE AO_t
-   AO_load_read(volatile AO_t *addr)
+   AO_load_read(const volatile AO_t *addr)
    {
      AO_t result = AO_load(addr);
      /* Acquire barrier would be useless, since the load could be delayed  */
@@ -1202,7 +1202,7 @@ AO_test_and_set_acquire(volatile AO_TS_t *addr)
     && !defined(AO_HAVE_compare_and_swap_double_acquire)
    AO_INLINE int
    AO_compare_and_swap_double_acquire(volatile AO_double_t *addr,
-                                            AO_t o1, AO_t o2,
+                                            AO_t o1,
                                             AO_t n1, AO_t n2)
    {
      int result = AO_compare_and_swap_double(addr, o1, n1, n2);