diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-08-17 15:11:58 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-08-24 19:08:58 +0200 |
| commit | da9d60ecc32263eaf77882811d58fefad9f85dc9 (patch) | |
| tree | cf61c1cc4b6d5258ed768feb9687e91a2331b88d /src/network/socket/qtcpserver.cpp | |
| parent | ad1980cd4326acca891ed0fa4326ed1b22828324 (diff) | |
Make sockets' accept() methods return qintptr
Not necessarily relevant outside windows, where the socket descriptor
is SOCKET (= unsigned 64-bit). Also follow their recommendation to not
compare to -1, but rather to INVALID_SOCKET.
Pick-to: 6.4 6.3 6.2
Change-Id: I0cfa4dfd9e147469132e2e72de22b30eab01e15c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/socket/qtcpserver.cpp')
| -rw-r--r-- | src/network/socket/qtcpserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qtcpserver.cpp b/src/network/socket/qtcpserver.cpp index e6ff34cee9..593f26687e 100644 --- a/src/network/socket/qtcpserver.cpp +++ b/src/network/socket/qtcpserver.cpp @@ -181,7 +181,7 @@ void QTcpServerPrivate::readNotification() return; } - int descriptor = socketEngine->accept(); + qintptr descriptor = socketEngine->accept(); if (descriptor == -1) { if (socketEngine->error() != QAbstractSocket::TemporaryError) { q->pauseAccepting(); |