aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authoruruk2014-04-29 11:26:39 +0200
committeruruk2014-04-29 11:26:39 +0200
commit5b105566a5637edcf73fd6cbc690c1b3b958ff2a (patch)
tree9b35a6c244e5f9fb7b01be1e6e1da994852534e2 /common
parentec71f936280496d349310ea0091dbe26b90ae540 (diff)
parent55127114349219d57b7a9143a5d3d9bfd97e3e88 (diff)
downloadscummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.tar.gz
scummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.tar.bz2
scummvm-rg350-5b105566a5637edcf73fd6cbc690c1b3b958ff2a.zip
Merge remote-tracking branch 'origin/master' into cge2
Diffstat (limited to 'common')
-rw-r--r--common/scummsys.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 1342b0cde6..c30bc4a52a 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -405,8 +405,13 @@
typedef unsigned int uint32;
typedef signed int int32;
typedef unsigned int uint;
+ #ifdef __PLAYSTATION2__
+ typedef signed long int64;
+ typedef unsigned long uint64;
+ #else
typedef signed long long int64;
typedef unsigned long long uint64;
+ #endif
#endif