Merge branch 'master' into next

[oweals/u-boot.git] / include / compiler.h

diff --git a/include/compiler.h b/include/compiler.h
index 272fd3cf628c758f9a4d5f019d2a093f2955c47a..23f4b834d8df0fdf3d821c2d52deb9aff56a3cce 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
@@ -55,6 +53,7 @@ typedef unsigned int  uint;
 typedef uint8_t __u8;
 typedef uint16_t __u16;
 typedef uint32_t __u32;
+typedef unsigned int uint;
 
 #define uswap_16(x) \
        ((((x) & 0xff00) >> 8) | \
@@ -122,4 +121,10 @@ typedef unsigned int            uintptr_t;
 
 #endif
 
+/* compiler options */
+#define uninitialized_var(x)           x = x
+
+#define likely(x)      __builtin_expect(!!(x), 1)
+#define unlikely(x)    __builtin_expect(!!(x), 0)
+
 #endif