summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2012-07-01 12:45:23 +0400
committerIvan Maidanski <ivmai@mail.ru>2012-07-02 11:02:46 +0400
commit2729f87dae22386a6842f1a14fb20732f821ad5a (patch)
tree36b5420cd95cc9a09646b841e7cb3f7d541cf3e9
parent5423c25786c1a1f2dd36ea9ecc5f58975236c85c (diff)
downloadlibatomic_ops-2729f87dae22386a6842f1a14fb20732f821ad5a.tar.gz
Fix generalized AO_char/short_fetch_and_add CTYPE args
(fix missing 'unsigned' for generalized fetch_and_add primitives) * src/atomic_ops/generalize-small.template (AO_XSIZE_fetch_and_add_full, AO_XSIZE_fetch_and_add_acquire, AO_XSIZE_fetch_and_add_release): Fix type of function arguments (or local variables) by adding 'unsigned' to XCTYPE. * src/atomic_ops/generalize-small.h: Regenerate.
-rw-r--r--src/atomic_ops/generalize-small.h18
-rw-r--r--src/atomic_ops/generalize-small.template6
2 files changed, 12 insertions, 12 deletions
diff --git a/src/atomic_ops/generalize-small.h b/src/atomic_ops/generalize-small.h
index c3a4403..7c2baa6 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 char
+ AO_INLINE unsigned 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 char
+ AO_INLINE unsigned 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 char
+ AO_INLINE unsigned 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 short
+ AO_INLINE unsigned 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 short
+ AO_INLINE unsigned 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 short
+ AO_INLINE unsigned 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 int
+ AO_INLINE unsigned 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 int
+ AO_INLINE unsigned 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 int
+ AO_INLINE unsigned 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 517a8a7..0f63732 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 XCTYPE
+ AO_INLINE unsigned 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 XCTYPE
+ AO_INLINE unsigned 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 XCTYPE
+ AO_INLINE unsigned XCTYPE
AO_XSIZE_fetch_and_add_release(volatile unsigned XCTYPE *addr,
unsigned XCTYPE incr)
{