diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp index b7f6f56a2b..80202db907 100644 --- a/src/mumble/mumble_pch.hpp +++ b/src/mumble/mumble_pch.hpp @@ -13,7 +13,7 @@ #define QT_USE_FAST_OPERATOR_PLUS #define NOMINMAX -#define _WINSOCKAPI_ +#define WIN32_LEAN_AND_MEAN #define BOOST_TYPEOF_SUPPRESS_UNNAMED_NAMESPACE @@ -74,18 +74,10 @@ #include #ifdef Q_OS_WIN -// Qt 5's qnetworksession.h undefs 'interface' (as defined in ObjBase.h on Windows). -// This causes Windows headers that use COM interfaces to break. Internally, it's -// just defined as 'struct', so we'll do that here as well to make things work again -// without too much hassle. -#ifndef interface -#define interface struct -#endif - -#include -#include #include #include +#include +#include #include #include #include @@ -94,6 +86,7 @@ #include #include #include +#include #define STACKVAR(type, varname, count) type *varname=reinterpret_cast(_alloca(sizeof(type) * (count)))