ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jake.Stine 2009-10-24 21:44:14 +00:00
parent ada3d9ed8a
commit 1cd5e52023
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/wxWidgets/include/wx/dynlib.h vendored
View File

@ -24,7 +24,8 @@
#endif #endif
#ifdef __WXMSW__ #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 #endif
// note that we have our own dlerror() implementation under Darwin // 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 // Note: __OS2__/EMX has to be tested first, since we want to use
// native version, even if configure detected presence of DLOPEN. // native version, even if configure detected presence of DLOPEN.
#if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__) #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
typedef HINSTANCE HMODULE;
typedef HMODULE wxDllType; typedef HMODULE wxDllType;
#elif defined(__DARWIN__) #elif defined(__DARWIN__)
// Don't include dlfcn.h on Darwin, we may be using our own replacements. // Don't include dlfcn.h on Darwin, we may be using our own replacements.