From 1cd5e520239f70f7d2d1dfdc9c69a3b7003ed05a Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sat, 24 Oct 2009 21:44:14 +0000 Subject: [PATCH] wxWidgets/win32: Removed another sneaky inclusion of Windows.h into wx's global namespace. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2070 96395faa-99c1-11dd-bbfe-3dabce05a288 --- 3rdparty/wxWidgets/include/wx/dynlib.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/3rdparty/wxWidgets/include/wx/dynlib.h b/3rdparty/wxWidgets/include/wx/dynlib.h index 3552bdcaaf..a3bba6f019 100644 --- a/3rdparty/wxWidgets/include/wx/dynlib.h +++ b/3rdparty/wxWidgets/include/wx/dynlib.h @@ -24,7 +24,8 @@ #endif #ifdef __WXMSW__ -#include "wx/msw/private.h" +// PCSX2: Can we PLEASE not include windows.h into everything, just for HINSTANCE? >_< --air +//#include "wx/msw/private.h" #endif // note that we have our own dlerror() implementation under Darwin @@ -41,6 +42,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator; // Note: __OS2__/EMX has to be tested first, since we want to use // native version, even if configure detected presence of DLOPEN. #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__) + typedef HINSTANCE HMODULE; typedef HMODULE wxDllType; #elif defined(__DARWIN__) // Don't include dlfcn.h on Darwin, we may be using our own replacements.