Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mumble_pch.hpp: Improve MinGW compatibility. #2781

Merged
merged 6 commits into from Mar 6, 2017
Merged

mumble_pch.hpp: Improve MinGW compatibility. #2781

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4064792
mumble_pch.hpp: Include "winsock2.h" before "windows.h"
davidebeatrici Jan 25, 2017
c8e3283
mumble_pch.hpp: Include "qos2.h" before "windows.h", as in Murmur
davidebeatrici Jan 26, 2017
d096132
mumble_pch.hpp: Delete _WINSOCKAPI_ definition
davidebeatrici Jan 26, 2017
9ab67db
mumble_pch.hpp: Define "WIN32_LEAN_AND_MEAN", as in "murmur_pch.h"
davidebeatrici Mar 6, 2017
2f3062a
mumble_pch.hpp: Include "mmreg.h" header
davidebeatrici Mar 6, 2017
cc00b21
mumble_pch.hpp: Remove "interface" workaround for Qt 5
davidebeatrici Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 4 additions & 11 deletions src/mumble/mumble_pch.hpp
View file
Open in desktop
Expand Up @@ -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

Expand Down Expand Up @@ -74,18 +74,10 @@
#include <algorithm>

#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 <windows.h>
#include <shellapi.h>
#include <winsock2.h>
#include <qos2.h>
#include <windows.h>
#include <shellapi.h>
#include <wintrust.h>
#include <softpub.h>
#include <dbt.h>
Expand All @@ -94,6 +86,7 @@
#include <tlhelp32.h>
#include <psapi.h>
#include <math.h>
#include <mmreg.h>

#define STACKVAR(type, varname, count) type *varname=reinterpret_cast<type *>(_alloca(sizeof(type) * (count)))

Expand Down