diff options
author | Max Horn | 2005-10-14 10:20:42 +0000 |
---|---|---|
committer | Max Horn | 2005-10-14 10:20:42 +0000 |
commit | 7ab5fa81141bfd77a919ed45b410e94252d8482e (patch) | |
tree | a62445786987ec725d56a59c275d6fa549009e94 /common | |
parent | 17f251a37fb1a88867a22095ee2e635e2a2da923 (diff) | |
download | scummvm-rg350-7ab5fa81141bfd77a919ed45b410e94252d8482e.tar.gz scummvm-rg350-7ab5fa81141bfd77a919ed45b410e94252d8482e.tar.bz2 scummvm-rg350-7ab5fa81141bfd77a919ed45b410e94252d8482e.zip |
cleanup (really would like to unify all those typedef's eventually; maybe we can use inttypes.h on some systems?)
svn-id: r19077
Diffstat (limited to 'common')
-rw-r--r-- | common/scummsys.h | 8 |
1 files changed, 5 insertions, 3 deletions
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) |