From 7ab5fa81141bfd77a919ed45b410e94252d8482e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 14 Oct 2005 10:20:42 +0000 Subject: cleanup (really would like to unify all those typedef's eventually; maybe we can use inttypes.h on some systems?) svn-id: r19077 --- common/scummsys.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'common/scummsys.h') diff --git a/common/scummsys.h b/common/scummsys.h index f00210e58b..32299c6820 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -135,8 +135,8 @@ typedef unsigned char byte; typedef unsigned char uint8; typedef unsigned short uint16; - typedef unsigned int uint; typedef unsigned int uint32; + typedef unsigned int uint; typedef signed char int8; typedef signed short int16; typedef signed int int32; @@ -260,10 +260,11 @@ typedef unsigned short uint16; typedef unsigned int uint32; typedef unsigned int uint; - typedef unsigned long uint64; typedef signed char int8; typedef signed short int16; typedef signed int int32; + + typedef unsigned long uint64; typedef signed long int64; #define START_PACK_STRUCTS pack (push, 1) @@ -299,11 +300,12 @@ typedef unsigned short uint16; typedef unsigned int uint32; typedef unsigned int uint; - typedef unsigned long uint64; typedef signed char int8; typedef signed short int16; typedef signed int int32; + typedef unsigned long uint64; + #define START_PACK_STRUCTS pack (push, 1) #define END_PACK_STRUCTS pack(pop) -- cgit v1.2.3