From 2b65e41d97f508d0390d2d09d301d49e73e0509d Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Fri, 10 Feb 2017 16:14:13 -0800 Subject: [PATCH] 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. --- Source/Core/DolphinWX/NetPlay/NetWindow.h | 9 +++++++++ 1 file changed, 9 insertions(+) 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 + class CGameListCtrl; class MD5Dialog; class wxButton;