diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-12-02 13:02:56 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-12-17 04:11:10 +0000 |
| commit | c7b0f56fb1d33ebd8e0b96cee64a1bfb99abdbbd (patch) | |
| tree | 4568a2ac433705c3f88da810d3c1b43ec8f479c7 /src/plugins/bearer | |
| parent | 7ca66b1e66e73a0cb35705df04507ef9f3440cab (diff) | |
Fix build on Windows: winsock2.h requires WIN32_LEAN_AND_MEAN
This is required for the next commit.
Change-Id: I73fa1e59a4844c43a109fffd148c8c3e3a100c79
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/bearer/platformdefs_win.h | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/qnetworksession_impl.cpp | 3 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index 02ea7abf88..059617b367 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -37,6 +37,9 @@ ** ****************************************************************************/ +// see comment in ../platformdefs_win.h. +#define WIN32_LEAN_AND_MEAN 1 + #include "qgenericengine.h" #include "../qnetworksession_impl.h" diff --git a/src/plugins/bearer/platformdefs_win.h b/src/plugins/bearer/platformdefs_win.h index 8fb2f1bcc5..5a8487d868 100644 --- a/src/plugins/bearer/platformdefs_win.h +++ b/src/plugins/bearer/platformdefs_win.h @@ -40,6 +40,8 @@ #ifndef QPLATFORMDEFS_WIN_H #define QPLATFORMDEFS_WIN_H +// Since we need to include winsock2.h, we need to define WIN32_LEAN_AND_MEAN +// somewhere above so windows.h won't include winsock.h. #include <winsock2.h> #include <mswsock.h> #undef interface diff --git a/src/plugins/bearer/qnetworksession_impl.cpp b/src/plugins/bearer/qnetworksession_impl.cpp index 5ce51670f7..7756709e55 100644 --- a/src/plugins/bearer/qnetworksession_impl.cpp +++ b/src/plugins/bearer/qnetworksession_impl.cpp @@ -37,6 +37,9 @@ ** ****************************************************************************/ +// see comment in ../platformdefs_win.h. +#define WIN32_LEAN_AND_MEAN 1 + #include "qnetworksession_impl.h" #include "qbearerengine_impl.h" |