From 42c701708fa97e419adcac349e97b0b9ad716c32 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Sun, 26 Dec 2010 09:28:49 -0800 Subject: [PATCH] Simplify variable typing for IA builds Change-Id: I3f080b34360bfade0dbd5e2d8d0365e049162e4c Signed-off-by: Bruce Beare --- libc/arch-x86/include/endian.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libc/arch-x86/include/endian.h b/libc/arch-x86/include/endian.h index ad37919f3..4a705364e 100644 --- a/libc/arch-x86/include/endian.h +++ b/libc/arch-x86/include/endian.h @@ -31,14 +31,14 @@ #if defined(_KERNEL) && !defined(I386_CPU) #define __swap32md(x) ({ \ - u_int32_t __swap32md_x = (x); \ + uint32_t __swap32md_x = (x); \ \ __asm ("bswap %1" : "+r" (__swap32md_x)); \ __swap32md_x; \ }) #else #define __swap32md(x) ({ \ - u_int32_t __swap32md_x = (x); \ + uint32_t __swap32md_x = (x); \ \ __asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" : \ "+r" (__swap32md_x)); \ @@ -47,13 +47,13 @@ #endif /* _KERNEL && !I386_CPU */ #define __swap64md(x) ({ \ - u_int64_t __swap64md_x = (x); \ + uint64_t __swap64md_x = (x); \ \ - (u_int64_t)__swap32md(__swap64md_x >> 32) | \ - (u_int64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \ + (uint64_t)__swap32md(__swap64md_x >> 32) | \ + (uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \ }) #define __swap16md(x) ({ \ - u_int16_t __swap16md_x = (x); \ + uint16_t __swap16md_x = (x); \ \ __asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \ __swap16md_x; \