From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 7 Jan 2013 15:24:02 +0000 (+0400)
Subject: Fix return type of AO_char/short/int_load_read() in read_ordered.h
X-Git-Tag: libatomic_ops-7_2e~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbed7d9bb0913bd1aa454d5c0e505ca325a414c2;p=libatomic_ops

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).
---

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;
   }