Try to use QtGlobal types when typedef'ing so that we stay as portable
From: Erik Hovland <erik@hovland.org>
as possible.
---
mythtv/libs/libmythupnp/httpserver.cpp | 2 +-
mythtv/libs/libmythupnp/multicast.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp
index b659ed5..cce3d07 100644
a
|
b
|
void HttpWorkerThread::ProcessWork() |
263 | 263 | { |
264 | 264 | bTimeout = 0; |
265 | 265 | |
266 | | int64_t nBytes = pSocket->WaitForMore(m_nSocketTimeout, &bTimeout); |
| 266 | qint64 nBytes = pSocket->WaitForMore(m_nSocketTimeout, &bTimeout); |
267 | 267 | |
268 | 268 | if ( nBytes > 0) |
269 | 269 | { |
diff --git a/mythtv/libs/libmythupnp/multicast.h b/mythtv/libs/libmythupnp/multicast.h
index 80c5bff..a9f2aec 100644
a
|
b
|
|
13 | 13 | #define __MULTICAST_H__ |
14 | 14 | |
15 | 15 | // Qt headers |
| 16 | #include <QtGlobal> |
16 | 17 | #include <QString> |
17 | 18 | #include <QByteArray> |
18 | 19 | #include <QHostAddress> |
… |
… |
class QMulticastSocket : public MSocketDevice |
42 | 43 | |
43 | 44 | public: |
44 | 45 | |
45 | | QMulticastSocket( QString sAddress, quint16 nPort, u_char ttl = 0 ) |
| 46 | QMulticastSocket( QString sAddress, quint16 nPort, uchar ttl = 0 ) |
46 | 47 | : MSocketDevice( MSocketDevice::Datagram ) |
47 | 48 | { |
48 | 49 | m_address.setAddress( sAddress ); |