diff options
| author | jkh <jkh@FreeBSD.org> | 1995-02-12 08:31:31 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-02-12 08:31:31 +0000 |
| commit | ec0b39d2fdbbfab3d1fb1e117ae107565044fda7 (patch) | |
| tree | e983dd99f9436002830b3c5b62f03000093a9647 /sys/i386/include/endian.h | |
| parent | 4f17013f5727f0f7d36b6ce094e38825be8491d0 (diff) | |
| download | FreeBSD-src-ec0b39d2fdbbfab3d1fb1e117ae107565044fda7.zip FreeBSD-src-ec0b39d2fdbbfab3d1fb1e117ae107565044fda7.tar.gz | |
Rename the local variable used by various macros outside the user's
namespace.
Reported-By: "Philippe Charnier" <charnier@lirmm.fr>
Diffstat (limited to 'sys/i386/include/endian.h')
| -rw-r--r-- | sys/i386/include/endian.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index f9a2875..ac60e4c 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $Id: endian.h,v 1.4 1993/12/19 05:14:45 alm Exp $ + * $Id: endian.h,v 1.5 1994/09/10 20:03:14 csgr Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -58,37 +58,37 @@ #endif #define __word_swap_long(x) \ -({ register u_long X = (x); \ +({ register u_long __X = (x); \ __asm ("rorl $16, %1" \ - : "=r" (X) \ - : "0" (X)); \ - X; }) + : "=r" (__X) \ + : "0" (__X)); \ + __X; }) #if __GNUC__ >= 2 #define __byte_swap_long(x) \ -({ register u_long X = (x); \ +({ register u_long __X = (x); \ __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \ - : "=q" (X) \ - : "0" (X)); \ - X; }) + : "=q" (__X) \ + : "0" (__X)); \ + __X; }) #define __byte_swap_word(x) \ -({ register u_short X = (x); \ +({ register u_short __X = (x); \ __asm ("xchgb %h1, %b1" \ - : "=q" (X) \ - : "0" (X)); \ - X; }) + : "=q" (__X) \ + : "0" (__X)); \ + __X; }) #else /* __GNUC__ >= 2 */ #define __byte_swap_long(x) \ -({ register u_long X = (x); \ +({ register u_long __X = (x); \ __asm ("rorw $8, %w1\n\trorl $16, %1\n\trorw $8, %w1" \ - : "=r" (X) \ - : "0" (X)); \ - X; }) + : "=r" (__X) \ + : "0" (__X)); \ + __X; }) #define __byte_swap_word(x) \ -({ register u_short X = (x); \ +({ register u_short __X = (x); \ __asm ("rorw $8, %w1" \ - : "=r" (X) \ - : "0" (X)); \ - X; }) + : "=r" (__X) \ + : "0" (__X)); \ + __X; }) #endif /* __GNUC__ >= 2 */ /* |
