diff options
| author | Paweł Kołodziejski | 2006-03-04 15:26:26 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2006-03-04 15:26:26 +0000 |
| commit | 95116f2098fa5412a6532475e2d15b9435f12ebd (patch) | |
| tree | 2f9b7ad5ea4e123fa81730f1481864be1d590915 | |
| parent | 6a4c709af669cb55321837fefc4756b040dec00c (diff) | |
| download | scummvm-rg350-95116f2098fa5412a6532475e2d15b9435f12ebd.tar.gz scummvm-rg350-95116f2098fa5412a6532475e2d15b9435f12ebd.tar.bz2 scummvm-rg350-95116f2098fa5412a6532475e2d15b9435f12ebd.zip | |
define int types for msvc to allow compile mpeg2 library. msvc does not fully conform C99
svn-id: r21073
| -rw-r--r-- | common/scummsys.h | 7 | ||||
| -rw-r--r-- | graphics/animation.h | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index fa9b639e1e..27be0cb28e 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -70,6 +70,13 @@ typedef signed short int16; typedef signed long int32; + typedef int8 int8_t; + typedef int16 int16_t; + typedef int32 int32_t; + typedef uint8 uint8_t; + typedef uint16 uint16_t; + typedef uint32 uint32_t; + #define START_PACK_STRUCTS pack(push, 1) #define END_PACK_STRUCTS pack(pop) diff --git a/graphics/animation.h b/graphics/animation.h index 5165ba7b0b..c3ee5179ae 100644 --- a/graphics/animation.h +++ b/graphics/animation.h @@ -33,7 +33,10 @@ class AudioStream; #ifdef USE_MPEG2 +#if !defined(_MSC_VER) #include <inttypes.h> +#endif + extern "C" { #include <mpeg2dec/mpeg2.h> } |