From fb7368e12f7e64b66185a2ca27e766e1002880c8 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 3 Mar 2006 01:12:50 +0000 Subject: More 64bit simulator fixes: inttypes, settings block handling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8888 a1c6a512-1295-4272-9138-f99709370657 --- firmware/include/inttypes.h | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'firmware/include') diff --git a/firmware/include/inttypes.h b/firmware/include/inttypes.h index bca06de..6127485 100644 --- a/firmware/include/inttypes.h +++ b/firmware/include/inttypes.h @@ -20,14 +20,34 @@ #ifndef __INTTYPES_H__ #define __INTTYPES_H__ -#define int8_t signed char -#define int16_t short -#define int32_t long -#define int64_t long long +#include +/* 8 bit */ +#define int8_t signed char #define uint8_t unsigned char + +/* 16 bit */ +#if USHRT_MAX == 0xffff +#define int16_t short #define uint16_t unsigned short +#endif + +/* 32 bit */ +#if ULONG_MAX == 0xfffffffful +#define int32_t long #define uint32_t unsigned long +#elif UINT_MAX == 0xffffffffu +#define int32_t int +#define uint32_t unsigned int +#endif + +/* 64 bit */ +#if ULONG_MAX == 0xffffffffffffffffull +#define int64_t long +#define uint64_t unsigned long +#else +#define int64_t long long #define uint64_t unsigned long long +#endif #endif /* __INTTYPES_H__ */ -- cgit v1.1