[Scummvm-cvs-logs] SF.net SVN: scummvm: [28522] scummvm/trunk/backends/platform/sdl/main.cpp

[thebluegr at users.sourceforge.net]

Revision: 28522
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28522&view=rev
Author:   thebluegr
Date:     2007-08-11 04:31:31 -0700 (Sat, 11 Aug 2007)

Log Message:
-----------
windows.h needs to be included before sdl.h, to avoid redefinition of ARRAYSIZE

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/main.cpp

Modified: scummvm/trunk/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/main.cpp	2007-08-11 09:32:23 UTC (rev 28521)
+++ scummvm/trunk/backends/platform/sdl/main.cpp	2007-08-11 11:31:31 UTC (rev 28522)
@@ -23,15 +23,15 @@
  *
  */
 
-#include "backends/platform/sdl/sdl.h"
-#include "base/main.h"
-
 #if defined(WIN32)
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE
 #endif
 
+#include "backends/platform/sdl/sdl.h"
+#include "base/main.h"
+
 #if defined(__SYMBIAN32__)
 #include "SymbianOs.h"
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.