1 files changed, 32 insertions, 54 deletions

diff --git a/src/mumble/mumble_pch.hpp b/src/mumble/mumble_pch.hpp
index 594350cd3..cabbdc8ac 100644
--- a/src/mumble/mumble_pch.hpp
+++ b/src/mumble/mumble_pch.hpp
@@ -12,28 +12,21 @@
 #define QT_USE_FAST_CONCATENATION
 #define QT_USE_FAST_OPERATOR_PLUS
 
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
+#include <QtCore/QtGlobal>
+
+#ifdef Q_OS_WIN
+# include "win.h"
+#endif
 
 #define BOOST_TYPEOF_SUPPRESS_UNNAMED_NAMESPACE
 
 #ifdef __APPLE__
-#include <Carbon/Carbon.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <ApplicationServices/ApplicationServices.h>
-#undef nil
-#undef check
-#undef TYPE_BOOL
-#endif
-
-#ifdef __MINGW32__
-// Our MinGW build targets Windows 7 for now.
-// Set up the appropriate Windows macros such that
-// MinGW's Windows headers expose all the functionality
-// we need.
-#define _WIN32_WINNT 0x0601
-#define NTDDI_VERSION NTDDI_WIN7
-#include <ws2tcpip.h>
+# include <Carbon/Carbon.h>
+# include <CoreFoundation/CoreFoundation.h>
+# include <ApplicationServices/ApplicationServices.h>
+# undef nil
+# undef check
+# undef TYPE_BOOL
 #endif
 
 #include <QtCore/QtCore>
@@ -45,19 +38,19 @@
 
 #include <QtSvg/QtSvg>
 #ifdef USE_DBUS
-#include <QtDBus/QtDBus>
+# include <QtDBus/QtDBus>
 #endif
 #include <QtNetwork/QtNetwork>
 #include <QtSql/QtSql>
 #include <QtXml/QtXml>
 
 #ifdef Q_OS_WIN
-#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+# define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
 #endif
 #include <sndfile.h>
 #include <celt.h>
 #ifdef USE_SBCELT
-#include <sbcelt.h>
+# include <sbcelt.h>
 #endif
 #include <speex/speex.h>
 #include <speex/speex_jitter.h>
@@ -85,46 +78,31 @@
 #include <cmath>
 
 #ifdef Q_OS_WIN
-#include "../qos2_mingw.h"
-
-#include <winsock2.h>
-#include <qos2.h>
-#include <windows.h>
-#include <shellapi.h>
-#include <wintrust.h>
-#include <softpub.h>
-#include <dbt.h>
-#include <delayimp.h>
-#include <shlobj.h>
-#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)))
-
+# include <ws2tcpip.h>
+# include <qos2.h>
+# include <shellapi.h>
+# include <wintrust.h>
+# include <softpub.h>
+# include <dbt.h>
+# include <delayimp.h>
+# include <shlobj.h>
+# include <tlhelp32.h>
+# include <psapi.h>
+# include <mmreg.h>
 #else // ifndef Q_OS_WIN
-#include <math.h>
-#define STACKVAR(type, varname, count) type varname[count]
-#define CopyMemory(dst,ptr,len) memcpy(dst,ptr,len)
-#define ZeroMemory(ptr,len) memset(ptr, 0, len)
-#define __cdecl
-typedef WId HWND;
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
+# include <sys/socket.h>
+# include <sys/types.h>
+# include <arpa/inet.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
 #endif
 
 #if !defined(Q_OS_OPENBSD) && (defined(__MMX__) || defined(Q_OS_WIN))
-#include <mmintrin.h>
+# include <mmintrin.h>
 #endif
 
-#define iroundf(x) ( static_cast<int>(x) )
-
 #ifdef USE_BONJOUR
-#include <dns_sd.h>
+# include <dns_sd.h>
 #endif
 
 #ifdef __OBJC__