about summary refs log tree commit diff
path: root/sysdeps/m68k
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>1999-11-29 17:50:55 +0000
committerAndreas Schwab <schwab@suse.de>1999-11-29 17:50:55 +0000
commit15e4660f059acc87b5e7a4e1193571c24d91d82b (patch)
tree730b3652d7ab05e6fd603e77bdecef6b77f51ea4 /sysdeps/m68k
parente486b034c753d112148c756e075bccd8a6462a41 (diff)
downloadglibc-15e4660f059acc87b5e7a4e1193571c24d91d82b.tar.gz
glibc-15e4660f059acc87b5e7a4e1193571c24d91d82b.tar.xz
glibc-15e4660f059acc87b5e7a4e1193571c24d91d82b.zip
* sysdeps/m68k/bits/byteswap.h (__bswap_32): Rename local variable
__v to __bswap_32_v. 
(__bswap_64): Rename local variables __v and __r to __bswap_64_v 
and __bswap_64_r to avoid clash with __bswap_32 macro.
Diffstat (limited to 'sysdeps/m68k')
-rw-r--r--sysdeps/m68k/bits/byteswap.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/sysdeps/m68k/bits/byteswap.h b/sysdeps/m68k/bits/byteswap.h
index 41bbe59782..e828fc6554 100644
--- a/sysdeps/m68k/bits/byteswap.h
+++ b/sysdeps/m68k/bits/byteswap.h
@@ -34,17 +34,17 @@
 
 #if defined __GNUC__ && __GNUC__ >= 2
 # define __bswap_32(x) \
-  __extension__					\
-  ({ unsigned int __v;				\
-     if (__builtin_constant_p (x))		\
-       __v = __bswap_constant_32 (x);		\
-     else					\
-       __asm__ __volatile__ ("ror%.w %#8, %0;"	\
-			     "swap %0;"		\
-			     "ror%.w %#8, %0"	\
-			     : "=d" (__v)	\
-			     : "0" (x));	\
-     __v; })
+  __extension__						\
+  ({ unsigned int __bswap_32_v;				\
+     if (__builtin_constant_p (x))			\
+       __bswap_32_v = __bswap_constant_32 (x);		\
+     else						\
+       __asm__ __volatile__ ("ror%.w %#8, %0;"		\
+			     "swap %0;"			\
+			     "ror%.w %#8, %0"		\
+			     : "=d" (__bswap_32_v)	\
+			     : "0" (x));		\
+     __bswap_32_v; })
 #else
 # define __bswap_32(x) __bswap_constant_32 (x)
 #endif
@@ -52,11 +52,11 @@
 #if defined __GNUC__ && __GNUC__ >= 2
 /* Swap bytes in 64 bit value.  */
 # define __bswap_64(x) \
-  __extension__						\
-  ({ union { unsigned long long int __ll;		\
-	     unsigned long int __l[2]; } __v, __r;	\
-     __v.__ll = (x);					\
-     __r.__l[0] = __bswap_32 (__v.__l[1]);		\
-     __r.__l[1] = __bswap_32 (__v.__l[0]);		\
-     __r.__ll; })
+  __extension__								\
+  ({ union { unsigned long long int __ll;				\
+	     unsigned long int __l[2]; } __bswap_64_v, __bswap_64_r;	\
+     __bswap_64_v.__ll = (x);						\
+     __bswap_64_r.__l[0] = __bswap_32 (__bswap_64_v.__l[1]);		\
+     __bswap_64_r.__l[1] = __bswap_32 (__bswap_64_v.__l[0]);		\
+     __bswap_64_r.__ll; })
 #endif