aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostas Nakos2006-06-10 17:36:57 +0000
committerKostas Nakos2006-06-10 17:36:57 +0000
commitf29a09a35f144b1951f48bd88d664d71afacce9f (patch)
tree7e14fd3c4fc073bc3ce25ced25c6de590825400f
parent897fa6a5a64a3424ae4ea83b1c7cad77ac7e8200 (diff)
downloadscummvm-rg350-f29a09a35f144b1951f48bd88d664d71afacce9f.tar.gz
scummvm-rg350-f29a09a35f144b1951f48bd88d664d71afacce9f.tar.bz2
scummvm-rg350-f29a09a35f144b1951f48bd88d664d71afacce9f.zip
fixes ps2 stuff I broke
svn-id: r23013
-rw-r--r--common/scummsys.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index a3553b3b60..3e779d7ee3 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -256,8 +256,6 @@
#define START_PACK_STRUCTS pack(push, 1)
#define END_PACK_STRUCTS pack(pop)
- #include "backends/ps2/fileio.h"
-
#define fopen(a, b) ps2_fopen(a, b)
#define fclose(a) ps2_fclose(a)
#define fflush(a) ps2_fflush(a)
@@ -449,5 +447,16 @@
typedef int16 OverlayColor;
#endif
+#ifdef __PLAYSTATION2__
+ // for libmpeg2...
+ typedef uint8 uint8_t;
+ typedef uint32 uint32_t;
+
+ // for those replaced fopen/fread/etc functions
+ typedef unsigned long uint64;
+ typedef signed long int64;
+ #include "backends/ps2/fileio.h"
+#endif
+
#endif