Ticket #4700: ScummVM-MSVC-r47975.patch

backends/platform/sdl/main.cpp

@@ -23 +23 @@
  *
  */
 
-#include "common/scummsys.h"
+#if defined(WIN32)
+#include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
+#endif
 
 // Several SDL based ports use a custom main, and hence do not want to compile
 // of this file. The following "#if" ensures that.
@@ -35 +39 @@
 #include "base/main.h"
 
 #if defined(WIN32)
-
-#include <windows.h>
-// winnt.h defines ARRAYSIZE, but we want our own one...
-#undef ARRAYSIZE
-
 int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
         SDL_SetModuleHandle(GetModuleHandle(NULL));
         return main(__argc, __argv);