diff options
| author | Andrew Kurushin | 2006-05-23 16:49:46 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2006-05-23 16:49:46 +0000 |
| commit | 36957a2c50fdd3fc0195981cedf4cc65f24f8a95 (patch) | |
| tree | 9f9340d3647ddfaf0519c769354ffb81324af7a3 | |
| parent | f38af30d6a42cde9491ff96f742f5027d5587253 (diff) | |
| download | scummvm-rg350-36957a2c50fdd3fc0195981cedf4cc65f24f8a95.tar.gz scummvm-rg350-36957a2c50fdd3fc0195981cedf4cc65f24f8a95.tar.bz2 scummvm-rg350-36957a2c50fdd3fc0195981cedf4cc65f24f8a95.zip | |
fix VC & SDL 1.2.10 compilation error
svn-id: r22585
| -rw-r--r-- | backends/sdl/sdl-common.h | 3 | ||||
| -rw-r--r-- | common/scummsys.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h index 3e01a59510..b0d82e7e70 100644 --- a/backends/sdl/sdl-common.h +++ b/backends/sdl/sdl-common.h @@ -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. diff --git a/common/scummsys.h b/common/scummsys.h index ef9278fe25..ca97750e57 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -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__) |