summaryrefslogtreecommitdiffstats
path: root/src/network/socket
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-08-18 15:20:33 (GMT)
committermread <qt-info@nokia.com>2009-08-18 15:20:33 (GMT)
commita1cfdc273bac90d58754c286810353ccb0be4b2e (patch)
treef9421b62177adafe90de70a03231d09103dcb823 /src/network/socket
parent3803c3984aa5d3993066f3a0cc3218b44ab4eb6c (diff)
parent3d6056dfe01116e34a2b47a70fb95e73753ef766 (diff)
downloadQt-a1cfdc273bac90d58754c286810353ccb0be4b2e.zip
Qt-a1cfdc273bac90d58754c286810353ccb0be4b2e.tar.gz
Qt-a1cfdc273bac90d58754c286810353ccb0be4b2e.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/socket')
-rw-r--r--src/network/socket/qnativesocketengine_p.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h
index 6b1e8c3..b7e5b9a 100644
--- a/src/network/socket/qnativesocketengine_p.h
+++ b/src/network/socket/qnativesocketengine_p.h
@@ -187,12 +187,6 @@ public:
int socketDescriptor;
-#if !defined(QT_NO_IPV6)
- struct sockaddr_storage aa;
-#else
- struct sockaddr_in aa;
-#endif
-
QSocketNotifier *readNotifier, *writeNotifier, *exceptNotifier;
#ifdef Q_OS_WIN