From abf94dbd10dbc9f067ff218d9a358aa4932fbeed Mon Sep 17 00:00:00 2001 From: Brian Somers Date: Sun, 15 Oct 2000 19:31:24 +0000 Subject: [PATCH] Remove namespace polution (x -> __x) introduced in the last revision. Pointed out by: bde --- sys/i386/include/endian.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h index e505f50ac3f3..e2d1fa59abcc 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; } /*