diff options
| author | Max Horn | 2004-10-17 17:57:33 +0000 |
|---|---|---|
| committer | Max Horn | 2004-10-17 17:57:33 +0000 |
| commit | a41b8d22937396c10b913a0e9d58af311bccc5ad (patch) | |
| tree | e411bddc701b7bfe75ad19ddec0d54cfef004fd8 | |
| parent | 267144e69c09862c230506ec1550b6b1ac8437f3 (diff) | |
| download | scummvm-rg350-a41b8d22937396c10b913a0e9d58af311bccc5ad.tar.gz scummvm-rg350-a41b8d22937396c10b913a0e9d58af311bccc5ad.tar.bz2 scummvm-rg350-a41b8d22937396c10b913a0e9d58af311bccc5ad.zip | |
Patch #1040501 (Possible fix for inttypes.h problem)
svn-id: r15590
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | graphics/animation.h | 8 |
2 files changed, 9 insertions, 8 deletions
@@ -877,7 +877,14 @@ echocheck "libmpeg2 >= 0.3.2" if test "$_mpeg2" = auto ; then _mpeg2=no cat > $TMPC << EOF -#include <inttypes.h> +typedef signed $type_1_byte int8_t; +typedef signed $type_2_byte int16_t; +typedef signed $type_4_byte int32_t; + +typedef unsigned $type_1_byte uint8_t; +typedef unsigned $type_2_byte uint16_t; +typedef unsigned $type_4_byte uint32_t; + #include <mpeg2dec/mpeg2.h> int main(void) { /* mpeg2_state_t first appears in 0.4.0 */ diff --git a/graphics/animation.h b/graphics/animation.h index 4722ceb176..727c8bd298 100644 --- a/graphics/animation.h +++ b/graphics/animation.h @@ -30,7 +30,7 @@ class AudioStream; // Uncomment this if you are using libmpeg2 0.3.1. // #define USE_MPEG2_0_3_1 -#ifdef _MSC_VER +#ifdef USE_MPEG2 typedef int8 int8_t; typedef int16 int16_t; typedef int32 int32_t; @@ -38,13 +38,7 @@ typedef int32 int32_t; typedef uint8 uint8_t; typedef uint16 uint16_t; typedef uint32 uint32_t; -#else -#ifndef __PALM_OS__ -#include <inttypes.h> -#endif -#endif -#ifdef USE_MPEG2 extern "C" { #include <mpeg2dec/mpeg2.h> } |