[Scummvm-cvs-logs] SF.net SVN: scummvm:[33629] scummvm/branches/gsoc2008-rtl
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Tue Aug 5 04:31:28 CEST 2008
Revision: 33629
http://scummvm.svn.sourceforge.net/scummvm/?rev=33629&view=rev
Author: cpage88
Date: 2008-08-05 02:31:26 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Merged revisions 33626-33627 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/backends/platform/sdl/sdl.cpp
scummvm/branches/gsoc2008-rtl/common/system.cpp
Property Changed:
----------------
scummvm/branches/gsoc2008-rtl/
Property changes on: scummvm/branches/gsoc2008-rtl
___________________________________________________________________
Modified: svnmerge-integrated
- /scummvm/trunk:1-33623
+ /scummvm/trunk:1-33628
Modified: scummvm/branches/gsoc2008-rtl/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/backends/platform/sdl/sdl.cpp 2008-08-05 02:11:00 UTC (rev 33628)
+++ scummvm/branches/gsoc2008-rtl/backends/platform/sdl/sdl.cpp 2008-08-05 02:31:26 UTC (rev 33629)
@@ -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"
Modified: scummvm/branches/gsoc2008-rtl/common/system.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/common/system.cpp 2008-08-05 02:11:00 UTC (rev 33628)
+++ scummvm/branches/gsoc2008-rtl/common/system.cpp 2008-08-05 02:31:26 UTC (rev 33629)
@@ -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;
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