summaryrefslogtreecommitdiffstats
path: root/src/qt3support/network
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-07-14 07:27:10 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-07-14 08:33:21 (GMT)
commit503c48853eefe547631c425e9acad810b76e61fe (patch)
tree5392090596f9f1075e576854d3a8fa065a367ef6 /src/qt3support/network
parentf23fa541a04abd1ddc36815a285ec824d5b5c5e0 (diff)
downloadQt-503c48853eefe547631c425e9acad810b76e61fe.zip
Qt-503c48853eefe547631c425e9acad810b76e61fe.tar.gz
Qt-503c48853eefe547631c425e9acad810b76e61fe.tar.bz2
Build fix for mingw
we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
Diffstat (limited to 'src/qt3support/network')
-rw-r--r--src/qt3support/network/q3socketdevice_win.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index 926d699..a0f0c0f 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -47,20 +47,15 @@
#include <string.h>
+# include <qt_windows.h>
#if defined (QT_NO_IPV6)
-# include <windows.h>
# include <winsock.h>
#else
# if defined (Q_CC_BOR) || defined (Q_CC_GNU)
# include <winsock2.h>
-# elif defined (Q_CC_INTEL)
-# include <winsock.h>
# else
-# include <windows.h>
-# if defined(Q_OS_WINCE)
# include <winsock.h>
# endif
-# endif
// Use our own defines and structs which we know are correct
# define QT_SS_MAXSIZE 128
# define QT_SS_ALIGNSIZE (sizeof(__int64))