diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-09-12 23:44:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 23:44:16 +0300 |
| commit | a38d19a7595c3e672f5ed549400b36348e01e442 (patch) | |
| tree | 34bd1c4db9b95748d263aea811e849dec7e5525c /src/murmur/Server.cpp | |
| parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
| parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) | |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/murmur/Server.cpp')
| -rw-r--r-- | src/murmur/Server.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 9a3872f98..7315aab7f 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -3,8 +3,6 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "murmur_pch.h" - #include "Server.h" #include "ACL.h" @@ -22,12 +20,30 @@ #include "HostAddress.h" #ifdef USE_BONJOUR -#include "BonjourServer.h" -#include "BonjourServiceRegister.h" +# include "BonjourServer.h" +# include "BonjourServiceRegister.h" +#endif + +#include "Utils.h" + +#include <QtCore/QCoreApplication> +#include <QtCore/QXmlStreamAttributes> +#include <QtCore/QtEndian> +#include <QtNetwork/QHostInfo> +#include <QtNetwork/QSslConfiguration> + +#include <boost/bind.hpp> + +#ifdef Q_OS_WIN +# include <qos2.h> +# include <ws2tcpip.h> +#else +# include <netinet/in.h> +# include <poll.h> #endif #ifndef MAX -#define MAX(a,b) ((a)>(b) ? (a):(b)) +# define MAX(a,b) ((a)>(b) ? (a):(b)) #endif #define UDP_PACKET_SIZE 1024 |