Merge branch 'for-upstream' of git://git.denx.de/u-boot-atmel

[karo-tx-uboot.git] / include / compiler.h

diff --git a/include/compiler.h b/include/compiler.h
index 332618e9de9c04282433030c87b1b2272556ccb5..91dbe56994c240c42be04b9d9e848e0e7a1f33c5 100644 (file)
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -25,8 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 
-extern int errno;
-
 #if !defined(__WIN32__) && !defined(__MINGW32__)
 # include <sys/mman.h>
 #endif
@@ -49,12 +47,12 @@ extern int errno;
 #elif defined(__MACH__)
 # include <machine/endian.h>
 typedef unsigned long ulong;
-typedef unsigned int  uint;
 #endif
 
 typedef uint8_t __u8;
 typedef uint16_t __u16;
 typedef uint32_t __u32;
+typedef unsigned int uint;
 
 #define uswap_16(x) \
        ((((x) & 0xff00) >> 8) | \