From c379a722e3b9348bb713d16105cae32016d85ec9 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 17 Sep 2018 16:24:20 +0200 Subject: [PATCH] Fix clash with struct interface --- src/plugins/simulator/fsxcommon/simconnectwindows.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/plugins/simulator/fsxcommon/simconnectwindows.h b/src/plugins/simulator/fsxcommon/simconnectwindows.h index 1139fec64..025992450 100644 --- a/src/plugins/simulator/fsxcommon/simconnectwindows.h +++ b/src/plugins/simulator/fsxcommon/simconnectwindows.h @@ -7,9 +7,16 @@ #ifndef NOMINMAX #define NOMINMAX #endif + +// clash with struct interface in objbase.h used to happen +#pragma push_macro("interface") +#undef interface + #include #include +#pragma pop_macro("interface") + #ifndef Q_OS_WIN64 //! adding struct SIMCONNECT_DATA_PBH not existing in SimConnect FSX struct SIMCONNECT_DATA_PBH