diff options
| author | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-02-10 16:14:13 -0800 |
|---|---|---|
| committer | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-02-10 16:14:25 -0800 |
| commit | 2b65e41d97f508d0390d2d09d301d49e73e0509d (patch) | |
| tree | 7bbe8b92663bba3e83ac1a1cbc8160282f2d4f23 /Source/Core | |
| parent | 09744db781ab03f9c6427e90ce5b93722d26d066 (diff) | |
NetWindow: explicitly tell wxWidgets to clean up Windows macros
wxWidgets headers don't play well with some of the macros defined in
Windows headers and perform their own magic to fix things, as long as
they're included entirely either before or after any Windows headers.
This file can cause a conflict in other DolphinWX files because NetPlay
headers directly include ENet headers, which leak Windows header macros.
To fix this, explicitly tell wxWidgets here that it needs to re-clean
macros.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/NetPlay/NetWindow.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h index 3c5c6b27c0..32c3075fe7 100644 --- a/Source/Core/DolphinWX/NetPlay/NetWindow.h +++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h @@ -14,6 +14,15 @@ #include "Core/NetPlayProto.h" #include "Core/NetPlayServer.h" +// HACK: wxWidgets headers don't play well with some of the macros defined in Windows +// headers and perform their own magic to fix things, as long as they're included entirely +// either before or after any Windows headers. +// +// This file can cause a conflict in other DolphinWX files because NetPlay headers directly +// include ENet headers, which leak Windows header macros. To fix this, explicitly tell +// wxWidgets here that it needs to re-clean macros. +#include <wx/msw/winundef.h> + class CGameListCtrl; class MD5Dialog; class wxButton; |
