[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30061] branches/soc-2010-jwilkins/intern/ ghost/intern/GHOST_SystemWin32.cpp: merge of commit by elubie now mingw compiles again

[Tom Musgrove]

Revision: 30061
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30061
Author:   letterrip
Date:     2010-07-06 23:19:01 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
merge of commit by elubie now mingw compiles again

Modified Paths:
--------------
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-07-06 20:31:55 UTC (rev 30060)
+++ branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_SystemWin32.cpp	2010-07-06 21:19:01 UTC (rev 30061)
@@ -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,7 +96,6 @@
 #include "GHOST_WindowWin32.h"
 #include "GHOST_NDOFManager.h"
 
-#include <shlobj.h>
 
 // Key code values not found in winuser.h
 #ifndef VK_MINUS
@@ -1129,4 +1136,5 @@
 	}
 
 	return NULL;
-}
\ No newline at end of file
+}
+