From cbb251325f981da32dd0f61c75731444c188b6d0 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 3 Nov 2011 18:43:52 +0400 Subject: Fix generalized AO__fetch_and_add() return type * src/atomic_ops/generalize-small.template (AO_XSIZE_fetch_and_add_full, AO_XSIZE_fetch_and_add_acquire, AO_XSIZE_fetch_and_add_release): Change return type from AO_t to XCTYPE. * src/atomic_ops/generalize-small.h: Regenerate. --- src/atomic_ops/generalize-small.h | 18 +++++++++--------- src/atomic_ops/generalize-small.template | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/atomic_ops/generalize-small.h b/src/atomic_ops/generalize-small.h index 6548736..c3a4403 100644 --- a/src/atomic_ops/generalize-small.h +++ b/src/atomic_ops/generalize-small.h @@ -157,7 +157,7 @@ /* char_fetch_and_add */ #if defined(AO_HAVE_char_compare_and_swap_full) \ && !defined(AO_HAVE_char_fetch_and_add_full) - AO_INLINE AO_t + AO_INLINE char AO_char_fetch_and_add_full(volatile unsigned char *addr, unsigned char incr) { @@ -174,7 +174,7 @@ #if defined(AO_HAVE_char_compare_and_swap_acquire) \ && !defined(AO_HAVE_char_fetch_and_add_acquire) - AO_INLINE AO_t + AO_INLINE char AO_char_fetch_and_add_acquire(volatile unsigned char *addr, unsigned char incr) { @@ -191,7 +191,7 @@ #if defined(AO_HAVE_char_compare_and_swap_release) \ && !defined(AO_HAVE_char_fetch_and_add_release) - AO_INLINE AO_t + AO_INLINE char AO_char_fetch_and_add_release(volatile unsigned char *addr, unsigned char incr) { @@ -740,7 +740,7 @@ /* short_fetch_and_add */ #if defined(AO_HAVE_short_compare_and_swap_full) \ && !defined(AO_HAVE_short_fetch_and_add_full) - AO_INLINE AO_t + AO_INLINE short AO_short_fetch_and_add_full(volatile unsigned short *addr, unsigned short incr) { @@ -757,7 +757,7 @@ #if defined(AO_HAVE_short_compare_and_swap_acquire) \ && !defined(AO_HAVE_short_fetch_and_add_acquire) - AO_INLINE AO_t + AO_INLINE short AO_short_fetch_and_add_acquire(volatile unsigned short *addr, unsigned short incr) { @@ -774,7 +774,7 @@ #if defined(AO_HAVE_short_compare_and_swap_release) \ && !defined(AO_HAVE_short_fetch_and_add_release) - AO_INLINE AO_t + AO_INLINE short AO_short_fetch_and_add_release(volatile unsigned short *addr, unsigned short incr) { @@ -1323,7 +1323,7 @@ /* int_fetch_and_add */ #if defined(AO_HAVE_int_compare_and_swap_full) \ && !defined(AO_HAVE_int_fetch_and_add_full) - AO_INLINE AO_t + AO_INLINE int AO_int_fetch_and_add_full(volatile unsigned int *addr, unsigned int incr) { @@ -1340,7 +1340,7 @@ #if defined(AO_HAVE_int_compare_and_swap_acquire) \ && !defined(AO_HAVE_int_fetch_and_add_acquire) - AO_INLINE AO_t + AO_INLINE int AO_int_fetch_and_add_acquire(volatile unsigned int *addr, unsigned int incr) { @@ -1357,7 +1357,7 @@ #if defined(AO_HAVE_int_compare_and_swap_release) \ && !defined(AO_HAVE_int_fetch_and_add_release) - AO_INLINE AO_t + AO_INLINE int AO_int_fetch_and_add_release(volatile unsigned int *addr, unsigned int incr) { diff --git a/src/atomic_ops/generalize-small.template b/src/atomic_ops/generalize-small.template index 1200159..517a8a7 100644 --- a/src/atomic_ops/generalize-small.template +++ b/src/atomic_ops/generalize-small.template @@ -157,7 +157,7 @@ /* XSIZE_fetch_and_add */ #if defined(AO_HAVE_XSIZE_compare_and_swap_full) \ && !defined(AO_HAVE_XSIZE_fetch_and_add_full) - AO_INLINE AO_t + AO_INLINE XCTYPE AO_XSIZE_fetch_and_add_full(volatile unsigned XCTYPE *addr, unsigned XCTYPE incr) { @@ -174,7 +174,7 @@ #if defined(AO_HAVE_XSIZE_compare_and_swap_acquire) \ && !defined(AO_HAVE_XSIZE_fetch_and_add_acquire) - AO_INLINE AO_t + AO_INLINE XCTYPE AO_XSIZE_fetch_and_add_acquire(volatile unsigned XCTYPE *addr, unsigned XCTYPE incr) { @@ -191,7 +191,7 @@ #if defined(AO_HAVE_XSIZE_compare_and_swap_release) \ && !defined(AO_HAVE_XSIZE_fetch_and_add_release) - AO_INLINE AO_t + AO_INLINE XCTYPE AO_XSIZE_fetch_and_add_release(volatile unsigned XCTYPE *addr, unsigned XCTYPE incr) { -- cgit v1.2.1