diff options
| author | brian <brian@FreeBSD.org> | 2000-10-15 19:31:24 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2000-10-15 19:31:24 +0000 |
| commit | f14ff11317d869ad304bd94eccb8354f5748de20 (patch) | |
| tree | 369cdb2c0a8e455e6085e21b433f728613318792 /sys/i386/include/endian.h | |
| parent | 74f5353c0ac526e57acb8db53662db6508a63355 (diff) | |
| download | FreeBSD-src-f14ff11317d869ad304bd94eccb8354f5748de20.zip FreeBSD-src-f14ff11317d869ad304bd94eccb8354f5748de20.tar.gz | |
Remove namespace polution (x -> __x) introduced in the last
revision.
Pointed out by: bde
Diffstat (limited to 'sys/i386/include/endian.h')
| -rw-r--r-- | sys/i386/include/endian.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index e505f50..e2d1fa5 100644 --- a/sys/i386/include/endian.h +++ b/sys/i386/include/endian.h @@ -67,31 +67,31 @@ unsigned short ntohs __P((unsigned short)); __END_DECLS static __inline uint32_t -__uint16_swap_uint32(uint32_t x) +__uint16_swap_uint32(uint32_t __x) { - __asm ("rorl $16, %1" : "=r" (x) : "0" (x)); + __asm ("rorl $16, %1" : "=r" (__x) : "0" (__x)); - return x; + return __x; } static __inline uint32_t -__uint8_swap_uint32(uint32_t x) +__uint8_swap_uint32(uint32_t __x) { #if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU) - __asm ("bswap %0" : "=r" (x) : "0" (x)); + __asm ("bswap %0" : "=r" (__x) : "0" (__x)); #else __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" - : "=q" (x) : "0" (x)); + : "=q" (__x) : "0" (__x)); #endif - return x; + return __x; } static __inline uint16_t -__uint8_swap_uint16(uint16_t x) +__uint8_swap_uint16(uint16_t __x) { - __asm ("xchgb %h1, %b1" : "=q" (x) : "0" (x)); + __asm ("xchgb %h1, %b1" : "=q" (__x) : "0" (__x)); - return x; + return __x; } /* |
