libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-08 03:47:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged revisions 33626-33627 via svnmerge from

Browse Source 
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33629
This commit is contained in:
Christopher Page 2008-08-05 02:31:26 +00:00
commit 2acbc2a88e
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backends/platform/sdl/sdl.cpp
View File

@ -23,14 +23,18 @@
*
*/
#if defined(WIN32)
#include <windows.h>
#if defined(ARRAYSIZE)
// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
#undef ARRAYSIZE
#endif
#endif
#include "backends/platform/sdl/sdl.h"
#include "common/config-manager.h"
#include "common/events.h"
#include "common/file.h"
#if defined(WIN32) && defined(ARRAYSIZE)
// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
#undef ARRAYSIZE
#endif
#include "common/util.h"
#include "backends/saves/default/default-saves.h"

7
common/system.cpp
View File

@ -28,16 +28,9 @@
#include "common/config-manager.h"
#include "common/system.h"
#include "common/timer.h"
#if defined(WIN32) && defined(ARRAYSIZE)
// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
#undef ARRAYSIZE
#endif
#include "common/util.h"
#include "graphics/colormasks.h"
#include "gui/message.h"
#include "sound/mixer.h"
OSystem *g_system = 0;