diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-01-25 21:49:30 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-26 09:36:40 +0100 |
| commit | 0b64fe80dc86338f73f419a4f73af9b6e7500adb (patch) | |
| tree | 6c7dda922d32a57d77b4da62df22fc4c541ce034 /src | |
| parent | f933636717ca27a8cb0a733c02fe3fac7058101c (diff) | |
| download | qt-creator-0b64fe80dc86338f73f419a4f73af9b6e7500adb.tar.gz | |
fix zeroconf on windows
Change-Id: I54e5c284d7fe109fe2fe6b0f50b25acfc3868a71
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zeroconf/servicebrowser.cpp | 9 |
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 |