aboutsummaryrefslogtreecommitdiff
path: root/graphics/video
diff options
context:
space:
mode:
authorMax Horn2009-11-10 22:18:41 +0000
committerMax Horn2009-11-10 22:18:41 +0000
commitc3905f60ee71a4794fb11705b204f5ab0dbd0778 (patch)
tree29924c1ef20288abce31d73cd80a1517b751e52c /graphics/video
parentf107f7fc367c62c8af0659548d86d5418d794988 (diff)
downloadscummvm-rg350-c3905f60ee71a4794fb11705b204f5ab0dbd0778.tar.gz
scummvm-rg350-c3905f60ee71a4794fb11705b204f5ab0dbd0778.tar.bz2
scummvm-rg350-c3905f60ee71a4794fb11705b204f5ab0dbd0778.zip
Move definition of stdint types to the only file that needs them (mpeg_player.h)
svn-id: r45820
Diffstat (limited to 'graphics/video')
-rw-r--r--graphics/video/mpeg_player.h28
1 files changed, 19 insertions, 9 deletions
diff --git a/graphics/video/mpeg_player.h b/graphics/video/mpeg_player.h
index 48c15261fc..8f236073ce 100644
--- a/graphics/video/mpeg_player.h
+++ b/graphics/video/mpeg_player.h
@@ -34,19 +34,29 @@
#ifdef USE_MPEG2
-#ifdef __PLAYSTATION2__
-typedef uint8 uint8_t;
-typedef uint16 uint16_t;
-typedef uint32 uint32_t;
-#endif
-
-#if !defined(_MSC_VER)
-#ifndef PALMOS_MODE
+#if defined(__PLAYSTATION2__
+ typedef uint8 uint8_t;
+ typedef uint16 uint16_t;
+ typedef uint32 uint32_t;
+#elif defined(_WIN32_WCE)
+ typedef signed char int8_t;
+ typedef signed short int16_t;
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+#elif defined(_MSC_VER)
+ typedef signed char int8_t;
+ typedef signed short int16_t;
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ #if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210)
+ typedef signed long int32_t;
+ typedef unsigned long uint32_t;
+ #endif
+#elif !defined(PALMOS_MODE)
# include <inttypes.h>
#else
# include <stdint.h>
#endif
-#endif
extern "C" {
#include <mpeg2dec/mpeg2.h>