[Scummvm-cvs-logs] SF.net SVN: scummvm: [22585] scummvm/trunk/common
h00ligan at users.sourceforge.net
h00ligan at users.sourceforge.net
Tue May 23 09:52:12 CEST 2006
Revision: 22585
Author: h00ligan
Date: 2006-05-23 09:49:46 -0700 (Tue, 23 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22585&view=rev
Log Message:
-----------
fix VC & SDL 1.2.10 compilation error
Modified Paths:
--------------
scummvm/trunk/backends/sdl/sdl-common.h
scummvm/trunk/common/scummsys.h
Modified: scummvm/trunk/backends/sdl/sdl-common.h
===================================================================
--- scummvm/trunk/backends/sdl/sdl-common.h 2006-05-23 14:30:13 UTC (rev 22584)
+++ scummvm/trunk/backends/sdl/sdl-common.h 2006-05-23 16:49:46 UTC (rev 22585)
@@ -24,13 +24,14 @@
#ifndef SDL_COMMON_H
#define SDL_COMMON_H
+#include <SDL.h>
+
#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
#include "backends/intern.h"
-#include <SDL.h>
#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
// Uncomment this to enable the 'on screen display' code.
Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h 2006-05-23 14:30:13 UTC (rev 22584)
+++ scummvm/trunk/common/scummsys.h 2006-05-23 16:49:46 UTC (rev 22585)
@@ -102,10 +102,13 @@
typedef signed char int8_t;
typedef signed short int16_t;
- typedef signed long int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
+
+ #if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210)
+ typedef signed long int32_t;
typedef unsigned long uint32_t;
+ #endif
#elif defined(__MINGW32__)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list