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/MurmurIce.h | |
| parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
| parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) | |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/murmur/MurmurIce.h')
| -rw-r--r-- | src/murmur/MurmurIce.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index f780e5eff..86f1196c7 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -7,6 +7,13 @@ #ifndef MUMBLE_MURMUR_MURMURICE_H_ #define MUMBLE_MURMUR_MURMURICE_H_ +#include <QtCore/QtGlobal> + +#ifdef Q_OS_WIN +// To prevent <windows.h> (included by Ice) from including <winsock.h>. +# define WIN32_LEAN_AND_MEAN +#endif + #include <QtCore/QList> #include <QtCore/QMap> #include <QtCore/QMutex> |