Make *printf() return "int" instead of "void"

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

diff --git a/include/elf.h b/include/elf.h
index 4ea3926f83d9c60980f81e049c21d0f20f554aac..29f276d3f029320bbab74d64a08432b185ef5588 100644 (file)
--- a/include/elf.h
+++ b/include/elf.h
@@ -33,15 +33,7 @@
 #ifndef _ELF_H
 #define _ELF_H
 
-#if defined(__BEOS__)   || \
-    defined(__NetBSD__)  || \
-    defined(__FreeBSD__) || \
-    defined(__sun__)    || \
-    defined(__APPLE__)
-#include <inttypes.h>
-#elif defined(__linux__) && defined(USE_HOSTCC)
-#include <stdint.h>
-#endif
+#include "compiler.h"
 
 /*
  *  This version doesn't work for 64-bit ABIs - Erik.
@@ -410,7 +402,7 @@ typedef struct
 /* Extract relocation info - r_info */
 #define ELF32_R_SYM(i)         ((i) >> 8)
 #define ELF32_R_TYPE(i)                ((unsigned char) (i))
-#define ELF32_R_INFO(s,t)      (((s) << 8) + (unsigned char)(t))
+#define ELF32_R_INFO(s,t)      (((s) << 8) + (unsigned char)(t))
 
 /* Program Header */
 typedef struct {