[Scummvm-cvs-logs] CVS: scummvm/graphics animation.h,1.8,1.9

Max Horn fingolfin at users.sourceforge.net
Sun Oct 17 10:58:02 CEST 2004


Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26333/graphics

Modified Files:
	animation.h 
Log Message:
Patch #1040501 (Possible fix for inttypes.h problem)

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- animation.h	28 Jun 2004 22:35:20 -0000	1.8
+++ animation.h	17 Oct 2004 17:57:32 -0000	1.9
@@ -30,7 +30,7 @@
 // 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 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>
 }





More information about the Scummvm-git-logs mailing list