Ticket #8357: inttypes2.diff

File inttypes2.diff, 1.2 KB (added by eriktorbjorn, 20 years ago)

Alternative patch against an October 16 CVS snapshot

  • configure

    diff -ur ScummVM/configure ScummVM+hack/configure
    old new  
    877877if test "$_mpeg2" = auto ; then
    878878  _mpeg2=no
    879879  cat > $TMPC << EOF
    880 #include <inttypes.h>
     880typedef signed $type_1_byte int8_t;
     881typedef signed $type_2_byte int16_t;
     882typedef signed $type_4_byte int32_t;
     883
     884typedef unsigned $type_1_byte uint8_t;
     885typedef unsigned $type_2_byte uint16_t;
     886typedef unsigned $type_4_byte uint32_t;
     887
    881888#include <mpeg2dec/mpeg2.h>
    882889int main(void) {
    883890        /* mpeg2_state_t first appears in 0.4.0 */
  • graphics/animation.h

    diff -ur ScummVM/graphics/animation.h ScummVM+hack/graphics/animation.h
    old new  
    3030// Uncomment this if you are using libmpeg2 0.3.1.
    3131// #define USE_MPEG2_0_3_1
    3232
    33 #ifdef _MSC_VER
     33#ifdef USE_MPEG2
    3434typedef int8 int8_t;
    3535typedef int16 int16_t;
    3636typedef int32 int32_t;
     
    3838typedef uint8 uint8_t;
    3939typedef uint16 uint16_t;
    4040typedef uint32 uint32_t;
    41 #else
    42 #ifndef __PALM_OS__
    43 #include <inttypes.h>
    44 #endif
    45 #endif
    4641
    47 #ifdef USE_MPEG2
    4842extern "C" {
    4943        #include <mpeg2dec/mpeg2.h>
    5044}