aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWon Star2006-04-07 10:40:08 +0000
committerWon Star2006-04-07 10:40:08 +0000
commit7cd565f884f10ebdbd48137d3de1a7823b41d05d (patch)
treebf756a43200acdc4167e18909820e6992a929100
parentab41c88902f45431d6fe6cfac349ead7feeb1857 (diff)
downloadscummvm-rg350-7cd565f884f10ebdbd48137d3de1a7823b41d05d.tar.gz
scummvm-rg350-7cd565f884f10ebdbd48137d3de1a7823b41d05d.tar.bz2
scummvm-rg350-7cd565f884f10ebdbd48137d3de1a7823b41d05d.zip
Fix compile with GP32 by overriding datatypes.
svn-id: r21664
-rw-r--r--common/scummsys.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 33db07978c..98d9bab6c7 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -231,10 +231,18 @@
#define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT
- // FIXME: Do you really need to use 'long' on this port? Please replace
- // this comment with a new comment that states so, and ideally also
- // explains the reasons briefly.
- #define SCUMMVM_USE_LONG_INT
+ // Override typenames. uint is already defined by system header files.
+ #define SCUMMVM_DONT_DEFINE_TYPES
+ typedef unsigned char byte;
+
+ typedef unsigned char uint8;
+ typedef signed char int8;
+
+ typedef unsigned short int uint16;
+ typedef signed short int int16;
+
+ typedef unsigned long int uint32;
+ typedef signed long int int32;
#define START_PACK_STRUCTS pack(push, 1)
#define END_PACK_STRUCTS pack(pop)