AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on Windows: winsock2.h requires WIN32_LEAN_AND_MEAN

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2016-12-02 13:02:56 -08:00
parent 7ca66b1e66
commit c7b0f56fb1
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/bearer/generic/qgenericengine.cpp
View File

@ -37,6 +37,9 @@
**
****************************************************************************/
// see comment in ../platformdefs_win.h.
#define WIN32_LEAN_AND_MEAN 1
#include "qgenericengine.h"
#include "../qnetworksession_impl.h"

2
src/plugins/bearer/platformdefs_win.h
View File

@ -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

3
src/plugins/bearer/qnetworksession_impl.cpp
View File

@ -37,6 +37,9 @@
**
****************************************************************************/
// see comment in ../platformdefs_win.h.
#define WIN32_LEAN_AND_MEAN 1
#include "qnetworksession_impl.h"
#include "qbearerengine_impl.h"