From 3f75fb8d8f25af5b79b71ae74f453a2b220a11ce Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 3 Feb 2012 15:29:13 +0100 Subject: MinGW: Fix warnings. - Special #define to access HB seems no longer necessary (it was causing about mismatching DLL import attributes). Change-Id: I57cc7d57b12a67c1d549b053db81e1f198f87786 Reviewed-by: Joerg Bornemann --- src/network/socket/qlocalsocket_win.cpp | 2 +- src/network/socket/qnativesocketengine_win.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index a6f8ef2c2c..35b0130afc 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -108,8 +108,8 @@ void QLocalSocketPrivate::_q_winError(ulong windowsError, const QString &functio QLocalSocketPrivate::QLocalSocketPrivate() : QIODevicePrivate(), handle(INVALID_HANDLE_VALUE), - pipeReader(0), pipeWriter(0), + pipeReader(0), error(QLocalSocket::UnknownSocketError), state(QLocalSocket::UnconnectedState) { diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 7b3cdc0939..e57bfcb52b 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -732,6 +732,8 @@ bool QNativeSocketEnginePrivate::nativeBind(const QHostAddress &a, quint16 port) ipv6only = 1; ipv6only = ::setsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&ipv6only, sizeof(ipv6only) ); } +#else + Q_UNUSED(ipv6only) #endif break; case QAbstractSocket::IPv4Protocol: -- cgit v1.2.3