diff options
Diffstat (limited to 'src/murmur/Server.h')
-rw-r--r-- | src/murmur/Server.h | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 007532b7c..79dd87b07 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -6,6 +6,20 @@ #ifndef MUMBLE_MURMUR_SERVER_H_ #define MUMBLE_MURMUR_SERVER_H_ +#include <QtCore/QtGlobal> + +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include "ACL.h" +#include "Message.h" +#include "Mumble.pb.h" +#include "User.h" +#include "Timer.h" +#include "HostAddress.h" +#include "Ban.h" + #ifndef Q_MOC_RUN # include <boost/function.hpp> #endif @@ -26,18 +40,11 @@ #if defined(USE_QSSLDIFFIEHELLMANPARAMETERS) # include <QtNetwork/QSslDiffieHellmanParameters> #endif + #ifdef Q_OS_WIN -#include <windows.h> +# include <winsock2.h> #endif -#include "ACL.h" -#include "Message.h" -#include "Mumble.pb.h" -#include "User.h" -#include "Timer.h" -#include "HostAddress.h" -#include "Ban.h" - class BonjourServer; class Channel; class PacketDataStream; |