summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qlocalserver_unix.cpp
diff options
context:
space:
mode:
authorPeter Hartmann <peter.hartmann@nokia.com>2011-11-01 14:20:19 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-14 18:41:17 +0100
commit4329030b77dc2faf267cecc0a8b03ce3ed3437cf (patch)
tree3c543ff088b626b3aaa5b58826b7e595776d82ca /src/network/socket/qlocalserver_unix.cpp
parent49bd825a9626eda77fd9e8313e1868bed4c77bff (diff)
network: remove Symbian specific code
removes several files and cleans up the code, removing all Symbian specific #ifdef's etc. Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/socket/qlocalserver_unix.cpp')
-rw-r--r--src/network/socket/qlocalserver_unix.cpp18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index 851e898553..b3575920dc 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -111,24 +111,6 @@ bool QLocalServerPrivate::listen(const QString &requestedServerName)
::memcpy(addr.sun_path, fullServerName.toLatin1().data(),
fullServerName.toLatin1().size() + 1);
-#ifdef Q_OS_SYMBIAN
- // In SYMBIAN OS it can currently happen that accept is called twice,
- // once from waitForNewConnection and once via QSocketNotfier activity
- //
- // As an workaround, we set the socket to non blocking so possible
- // subsequent call to accept will not block in any case
- //
- // This change can be removed once more generic fix to select thread
- // synchronization problem is implemented.
- int flags = fcntl(listenSocket, F_GETFL, 0);
- if (-1 == flags
- || -1 == (fcntl(listenSocket, F_SETFL, flags | O_NONBLOCK))) {
- setError(QLatin1String("QLocalServer::listen"));
- closeServer();
- return false;
- }
-#endif
-
// bind
if(-1 == QT_SOCKET_BIND(listenSocket, (sockaddr *)&addr, sizeof(sockaddr_un))) {
setError(QLatin1String("QLocalServer::listen"));