From: Ivan Maidanski Date: Wed, 2 Jan 2013 21:02:08 +0000 (+0400) Subject: Remote duplicate definition of test_and_set_acquire in generalize.h X-Git-Tag: libatomic_ops-7_4_0~49 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc69423bd4668182143465ef0bd8dc118f713a4c;p=platform%2Fupstream%2Flibatomic_ops.git Remote duplicate definition of test_and_set_acquire in generalize.h * src/atomic_ops/generalize.h (AO_test_and_set_acquire): Remove redundant (duplicate) definition. --- diff --git a/src/atomic_ops/generalize.h b/src/atomic_ops/generalize.h index b4ededb..a496028 100644 --- a/src/atomic_ops/generalize.h +++ b/src/atomic_ops/generalize.h @@ -165,18 +165,6 @@ } # define AO_HAVE_test_and_set # endif /* AO_HAVE_compare_and_swap */ - -# if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ - && !defined(AO_HAVE_test_and_set_acquire) - AO_INLINE AO_TS_VAL_t - AO_test_and_set_acquire(volatile AO_TS_t *addr) - { - AO_TS_VAL_t result = AO_test_and_set(addr); - AO_nop_full(); - return result; - } -# define AO_HAVE_test_and_set_acquire -# endif #endif /* No prior test and set */ /* Nop */ @@ -212,7 +200,7 @@ # define AO_HAVE_nop_write #endif -/* NEC LE-IT: Test and set */ +/* Test_and_set */ #if defined(AO_HAVE_test_and_set) && defined(AO_HAVE_nop_full) \ && !defined(AO_HAVE_test_and_set_release) # define AO_test_and_set_release(addr) (AO_nop_full(), AO_test_and_set(addr)) @@ -231,7 +219,6 @@ # define AO_HAVE_test_and_set_acquire #endif -/* Test_and_set */ #if defined(AO_HAVE_test_and_set_full) # if !defined(AO_HAVE_test_and_set_release) # define AO_test_and_set_release(addr) AO_test_and_set_full(addr)