From 0e52f72de2c15a262fc6cc1b0dc50536a616b8e9 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 7 Jan 2013 19:24:02 +0400 Subject: [PATCH] Fix return type of AO_char/short/int_load_read() in read_ordered.h * src/atomic_ops/sysdeps/read_ordered.h (AO_char_load_read, AO_short_load_read, AO_int_load_read): Change return type (and the type of "result" local variable) from AO_t to the type matching the name of the function (i.e., unsigned char/short/int, respectively). --- src/atomic_ops/sysdeps/read_ordered.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/atomic_ops/sysdeps/read_ordered.h b/src/atomic_ops/sysdeps/read_ordered.h index 41ccd55..986cd3a 100644 --- a/src/atomic_ops/sysdeps/read_ordered.h +++ b/src/atomic_ops/sysdeps/read_ordered.h @@ -49,10 +49,10 @@ AO_nop_read(void) #endif /* AO_HAVE_load */ #ifdef AO_HAVE_char_load - AO_INLINE AO_t + AO_INLINE unsigned char AO_char_load_read(const volatile unsigned char *addr) { - AO_t result = AO_char_load(addr); + unsigned char result = AO_char_load(addr); AO_compiler_barrier(); return result; } @@ -63,10 +63,10 @@ AO_nop_read(void) #endif /* AO_HAVE_char_load */ #ifdef AO_HAVE_short_load - AO_INLINE AO_t + AO_INLINE unsigned short AO_short_load_read(const volatile unsigned short *addr) { - AO_t result = AO_short_load(addr); + unsigned short result = AO_short_load(addr); AO_compiler_barrier(); return result; } @@ -77,10 +77,10 @@ AO_nop_read(void) #endif /* AO_HAVE_short_load */ #ifdef AO_HAVE_int_load - AO_INLINE AO_t + AO_INLINE unsigned int AO_int_load_read(const volatile unsigned int *addr) { - AO_t result = AO_int_load(addr); + unsigned int result = AO_int_load(addr); AO_compiler_barrier(); return result; } -- 2.40.0