Ticket #5785: libs_libmythupnp-krazy2-typedef-to-QtGlobal-types-ticket-5785.patch

File libs_libmythupnp-krazy2-typedef-to-QtGlobal-types-ticket-5785.patch, 1.5 KB (added by Erik Hovland <erik@…>, 17 years ago)

Latest version of the patch against trunk as of 2008-12-06

  • mythtv/libs/libmythupnp/httpserver.cpp 

    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()  
    263263        {
    264264            bTimeout = 0;
    265265
    266             int64_t nBytes = pSocket->WaitForMore(m_nSocketTimeout, &bTimeout);
     266            qint64 nBytes = pSocket->WaitForMore(m_nSocketTimeout, &bTimeout);
    267267
    268268            if ( nBytes > 0)
    269269            {

  • mythtv/libs/libmythupnp/multicast.h 

    diff --git a/mythtv/libs/libmythupnp/multicast.h b/mythtv/libs/libmythupnp/multicast.h
index 80c5bff..a9f2aec 100644
    a b  
    1313#define __MULTICAST_H__
    1414
    1515// Qt headers
     16#include <QtGlobal>
    1617#include <QString>
    1718#include <QByteArray>
    1819#include <QHostAddress>
    … … class QMulticastSocket : public MSocketDevice  
    4243
    4344    public:
    4445
    45         QMulticastSocket( QString sAddress, quint16 nPort, u_char ttl = 0 )
     46        QMulticastSocket( QString sAddress, quint16 nPort, uchar ttl = 0 )
    4647         : MSocketDevice( MSocketDevice::Datagram )
    4748        {
    4849            m_address.setAddress( sAddress );