1.1 --- a/xen/arch/x86/boot/mkelf32.c	Fri Jul 01 10:55:46 2005 +0000
     1.2 +++ b/xen/arch/x86/boot/mkelf32.c	Fri Jul 01 12:30:19 2005 +0000
     1.3 @@ -15,33 +15,16 @@
     1.4  #include <sys/stat.h>
     1.5  #include <fcntl.h>
     1.6  #include <unistd.h>
     1.7 +#include <inttypes.h>
     1.8  
     1.9 -/*
    1.10 - * Here I'm taking care not to conflict with possible typedef's in
    1.11 - * standard headers by instead using the macro namespace.
    1.12 - */
    1.13 -#undef u8
    1.14 -#undef u16
    1.15 -#undef u32
    1.16 -#undef u64
    1.17 -#undef s8
    1.18 -#undef s16
    1.19 -#undef s32
    1.20 -#undef s64
    1.21 -#define u8  unsigned char
    1.22 -#define u16 unsigned short
    1.23 -#define u32 unsigned int
    1.24 -#define s8  signed char
    1.25 -#define s16 signed short
    1.26 -#define s32 signed int
    1.27 -#if defined(__i386__)
    1.28 -#define u64 unsigned long long
    1.29 -#define s64 signed long long
    1.30 -#else
    1.31 -#define u64 unsigned long
    1.32 -#define s64 signed long
    1.33 -#endif
    1.34 -
    1.35 +#define u8  uint8_t
    1.36 +#define u16 uint16_t
    1.37 +#define u32 uint32_t
    1.38 +#define u64 uint64_t
    1.39 +#define s8  int8_t
    1.40 +#define s16 int16_t
    1.41 +#define s32 int32_t
    1.42 +#define s64 int64_t
    1.43  #include "../../../include/xen/elf.h"
    1.44  
    1.45  #define DYNAMICALLY_FILLED   0