Ticket #8357: inttypes.diff

File inttypes.diff, 1.7 KB (added by eriktorbjorn, 20 years ago)

Patch against an October 5 CVS snapshot

  • configure

    diff -ur --exclude=CVS ScummVM/configure ScummVM+hack/configure
    old new  
    766766echo "$_build_plugins"
    767767
    768768#
     769# Check for inttypes.h
     770#
     771echocheck "inttypes.h"
     772_have_inttypes=no
     773cat > $TMPC << EOF
     774#include <inttypes.h>
     775int main(void) {
     776        return 0;
     777}
     778EOF
     779cc_check && _have_inttypes=yes
     780if test "$_have_inttypes" = yes ; then
     781    _def_inttypes='#define HAVE_INTTYPES'
     782else
     783    _def_inttypes='#undef HAVE_INTTYPES'
     784fi
     785echo "$_have_inttypes"
     786
     787#
    769788# Check for Ogg Vorbis
    770789#
    771790echocheck "Ogg Vorbis"
     
    10251044typedef signed $type_2_byte int16;
    10261045typedef signed $type_4_byte int32;
    10271046
     1047/* Headers */
     1048$_def_inttypes
     1049
    10281050/* Libs */
    10291051$_def_vorbis
    10301052$_def_flac
  • graphics/animation.h

    diff -ur --exclude=CVS ScummVM/graphics/animation.h ScummVM+hack/graphics/animation.h
    old new  
    2727
    2828class AudioStream;
    2929
    30 // Uncomment this if you are using libmpeg2 0.3.1.
    31 // #define USE_MPEG2_0_3_1
     30#ifdef USE_MPEG2
    3231
    33 #ifdef _MSC_VER
     32#ifdef HAVE_INTTYPES
     33#include <inttypes.h>
     34#else
    3435typedef int8 int8_t;
    3536typedef int16 int16_t;
    3637typedef int32 int32_t;
     
    3839typedef uint8 uint8_t;
    3940typedef uint16 uint16_t;
    4041typedef uint32 uint32_t;
    41 #else
    42 #ifndef __PALM_OS__
    43 #include <inttypes.h>
    44 #endif
    4542#endif
    4643
    47 #ifdef USE_MPEG2
    4844extern "C" {
    4945        #include <mpeg2dec/mpeg2.h>
    5046}
    5147
     48// Uncomment this if you are using libmpeg2 0.3.1.
     49// #define USE_MPEG2_0_3_1
     50
    5251#ifdef USE_MPEG2_0_3_1
    5352typedef int mpeg2_state_t;
    5453typedef sequence_t mpeg2_sequence_t;