diff options
| author | Jonas M. Gastal <jgastal@profusion.mobi> | 2012-01-05 10:38:39 -0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 15:07:51 +0100 |
| commit | bf7f17060773803f332e8c729a70f47b94243890 (patch) | |
| tree | e4c6f80001859748372f19b647ed77dc348e2564 /src/network/socket/qtcpserver.h | |
| parent | eb0ce0d5c123c010c978c96683cfd6b651540b07 (diff) | |
Make socket descriptors qintptr.
Windows x64 uses 64 bits integer for sockets, to ensure compatibility we
should use ptr sized integers for our socket descriptors.
Task-number: QTBUG-19004
Change-Id: I4b56023874a4f1bad107c66c054fecfedde33d88
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/network/socket/qtcpserver.h')
| -rw-r--r-- | src/network/socket/qtcpserver.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 4900ba89fe..a322294f58 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -76,8 +76,8 @@ public: quint16 serverPort() const; QHostAddress serverAddress() const; - int socketDescriptor() const; - bool setSocketDescriptor(int socketDescriptor); + qintptr socketDescriptor() const; + bool setSocketDescriptor(qintptr socketDescriptor); bool waitForNewConnection(int msec = 0, bool *timedOut = 0); virtual bool hasPendingConnections() const; @@ -92,7 +92,7 @@ public: #endif protected: - virtual void incomingConnection(int handle); + virtual void incomingConnection(qintptr handle); void addPendingConnection(QTcpSocket* socket); Q_SIGNALS: |