summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/libs/zeroconf/servicebrowser.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp
index abe8ab609f..096a1a35ad 100644
--- a/src/libs/zeroconf/servicebrowser.cpp
+++ b/src/libs/zeroconf/servicebrowser.cpp
@@ -30,6 +30,10 @@
**
**************************************************************************/
+//disable min max macros from windows headers,
+//because we want to use the template methods from std
+#define NOMINMAX
+
#include "mdnsderived.h"
#include "servicebrowser_p.h"
@@ -48,6 +52,11 @@
#include <QtCore/QtEndian>
#include <QtNetwork/QHostInfo>
+//the timeval struct under windows uses long instead of suseconds_t
+#ifdef Q_OS_WIN
+typedef long suseconds_t;
+#endif
+
/*!
\namespace ZeroConf