From c468f94f53674b5133772bc706b997233a75e86a Mon Sep 17 00:00:00 2001
From: Andrea Weikert <elubie@gmx.net>
Date: Tue, 6 Jul 2010 20:31:55 +0000
Subject: [PATCH] fix mingw compile - seems to have been conflicting #defines
 for INT, solved by moving #include up

---
 intern/ghost/intern/GHOST_SystemWin32.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 2b26edea38d..da7a0399f41 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -37,6 +37,14 @@
 #include "GHOST_SystemWin32.h"
 #include "GHOST_EventDragnDrop.h"
 
+#define WIN32_LEAN_AND_MEAN
+#ifdef _WIN32_IE
+#undef _WIN32_IE
+#endif
+#define _WIN32_IE 0x0501
+#include <windows.h>
+#include <shlobj.h>
+
 // win64 doesn't define GWL_USERDATA
 #ifdef WIN32
 #ifndef GWL_USERDATA
@@ -88,8 +96,6 @@
 #include "GHOST_WindowWin32.h"
 #include "GHOST_NDOFManager.h"
 
-#include <shlobj.h>
-
 // Key code values not found in winuser.h
 #ifndef VK_MINUS
 #define VK_MINUS 0xBD
@@ -1129,4 +1135,4 @@ const GHOST_TUns8* GHOST_SystemWin32::getBinaryDir() const
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}