Ticket #5786: libs_libmythupnp-krazy2-include-directives-ticket-5786.patch

File libs_libmythupnp-krazy2-include-directives-ticket-5786.patch, 25.3 KB (added by Erik Hovland <erik@…>, 12 years ago)

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

  • mythtv/libs/libmythupnp/broadcast.h

    Mangles include order and include macro guard to be 'cleaner'. May have
    
    From: Erik Hovland <erik@hovland.org>
    
    to jigger includes in headers to get everything to work right.
    ---
    
     mythtv/libs/libmythupnp/broadcast.h              |    4 ++--
     mythtv/libs/libmythupnp/bufferedsocketdevice.cpp |   11 +++++++----
     mythtv/libs/libmythupnp/bufferedsocketdevice.h   |    4 ++--
     mythtv/libs/libmythupnp/configuration.cpp        |   12 ++++++++----
     mythtv/libs/libmythupnp/configuration.h          |    4 ++--
     mythtv/libs/libmythupnp/darwin-sendfile.h        |    4 ++--
     mythtv/libs/libmythupnp/eventing.cpp             |   10 +++++++---
     mythtv/libs/libmythupnp/eventing.h               |    4 ++--
     mythtv/libs/libmythupnp/httprequest.h            |    4 ++--
     mythtv/libs/libmythupnp/httpserver.cpp           |   13 +++++++------
     mythtv/libs/libmythupnp/httpserver.h             |    4 ++--
     mythtv/libs/libmythupnp/multicast.h              |    4 ++--
     mythtv/libs/libmythupnp/mythxmlclient.h          |    4 ++--
     mythtv/libs/libmythupnp/refcounted.h             |    4 ++--
     mythtv/libs/libmythupnp/soapclient.cpp           |    9 ++++++---
     mythtv/libs/libmythupnp/soapclient.h             |    4 ++--
     mythtv/libs/libmythupnp/ssdp.h                   |    4 ++--
     mythtv/libs/libmythupnp/ssdpcache.h              |    4 ++--
     mythtv/libs/libmythupnp/taskqueue.h              |    4 ++--
     mythtv/libs/libmythupnp/threadpool.cpp           |    7 +++++--
     mythtv/libs/libmythupnp/threadpool.h             |    4 ++--
     mythtv/libs/libmythupnp/upnp.h                   |    4 ++--
     mythtv/libs/libmythupnp/upnpcds.cpp              |    9 ++++++---
     mythtv/libs/libmythupnp/upnpcds.h                |    4 ++--
     mythtv/libs/libmythupnp/upnpcdsobjects.h         |    4 ++--
     mythtv/libs/libmythupnp/upnpcmgr.cpp             |    2 +-
     mythtv/libs/libmythupnp/upnpcmgr.h               |    4 ++--
     mythtv/libs/libmythupnp/upnpdevice.cpp           |   11 ++++++++---
     mythtv/libs/libmythupnp/upnpdevice.h             |    4 ++--
     mythtv/libs/libmythupnp/upnpimpl.h               |    4 ++--
     mythtv/libs/libmythupnp/upnpmsrr.cpp             |    8 ++++++--
     mythtv/libs/libmythupnp/upnpmsrr.h               |    4 ++--
     mythtv/libs/libmythupnp/upnptaskcache.h          |    4 ++--
     mythtv/libs/libmythupnp/upnptaskevent.h          |    4 ++--
     mythtv/libs/libmythupnp/upnptasknotify.h         |    4 ++--
     mythtv/libs/libmythupnp/upnptasksearch.cpp       |   17 ++++++++++++-----
     mythtv/libs/libmythupnp/upnptasksearch.h         |    4 ++--
     mythtv/libs/libmythupnp/upnputil.cpp             |   19 ++++++++++---------
     mythtv/libs/libmythupnp/upnputil.h               |    4 ++--
     39 files changed, 137 insertions(+), 99 deletions(-)
    
    
    diff --git a/mythtv/libs/libmythupnp/broadcast.h b/mythtv/libs/libmythupnp/broadcast.h
    index bd95aa0..d850477 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __BROADCAST_H__
    13 #define __BROADCAST_H__
     12#ifndef BROADCAST_H
     13#define BROADCAST_H
    1414
    1515#include <QString>
    1616
  • mythtv/libs/libmythupnp/bufferedsocketdevice.cpp

    diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp b/mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
    index 3af08f7..cd4db15 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
     12// MythTV
     13#include "bufferedsocketdevice.h"
     14#include "upnputil.h"
     15#include <mythtimer.h>
     16#include <mythverbose.h>  // for VERBOSE
     17
     18// C++ standard library
    1219#include <algorithm>
    1320using namespace std;
    1421
    15 #include "mythtimer.h"
    16 #include "bufferedsocketdevice.h"
    17 #include "upnputil.h"
    18 #include "mythverbose.h"  // for VERBOSE
    1922
    2023/////////////////////////////////////////////////////////////////////////////
    2124//
  • mythtv/libs/libmythupnp/bufferedsocketdevice.h

    diff --git a/mythtv/libs/libmythupnp/bufferedsocketdevice.h b/mythtv/libs/libmythupnp/bufferedsocketdevice.h
    index 80503ab..38d6ee0 100644
    a b  
    88//                                                                           
    99//////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef __BUFFEREDSOCKETDEVICE_H__
    12 #define __BUFFEREDSOCKETDEVICE_H__
     11#ifndef BUFFEREDSOCKETDEVICE_H
     12#define BUFFEREDSOCKETDEVICE_H
    1313
    1414// C++ headers
    1515#include <deque>
  • mythtv/libs/libmythupnp/configuration.cpp

    diff --git a/mythtv/libs/libmythupnp/configuration.cpp b/mythtv/libs/libmythupnp/configuration.cpp
    index b7faa56..b5d7eb6 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
     12// MythTV
     13#include "configuration.h"
     14#include <mythverbose.h>  // for VERBOSE and GetConfDir()
     15#include <mythdb.h>
     16#include <mythdirs.h>
     17
     18// C++ standard library
    1219#include <iostream>
    1320
     21// Qt
    1422#include <QDir>
    1523#include <QFile>
    1624
    17 #include "configuration.h"
    18 #include "mythverbose.h"  // for VERBOSE and GetConfDir()
    19 #include "mythdb.h"
    20 #include "mythdirs.h"
    2125
    2226//////////////////////////////////////////////////////////////////////////////
    2327//
  • mythtv/libs/libmythupnp/configuration.h

    diff --git a/mythtv/libs/libmythupnp/configuration.h b/mythtv/libs/libmythupnp/configuration.h
    index 4167f8a..20783cc 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __CONFIGURATION_H__
    13 #define __CONFIGURATION_H__
     12#ifndef CONFIGURATION_H
     13#define CONFIGURATION_H
    1414
    1515#include <qdom.h>
    1616#include <qstringlist.h>
  • mythtv/libs/libmythupnp/darwin-sendfile.h

    diff --git a/mythtv/libs/libmythupnp/darwin-sendfile.h b/mythtv/libs/libmythupnp/darwin-sendfile.h
    index e088ea9..e85cfaf 100644
    a b  
    1 #ifndef _DARWIN_SENDFILE_H
    2 #define _DARWIN_SENDFILE_H
     1#ifndef DARWIN_SENDFILE_H
     2#define DARWIN_SENDFILE_H
    33
    44#ifdef __cplusplus
    55extern "C" {
  • mythtv/libs/libmythupnp/eventing.cpp

    diff --git a/mythtv/libs/libmythupnp/eventing.cpp b/mythtv/libs/libmythupnp/eventing.cpp
    index 22b21c3..fb38b88 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
     12// MythTV
     13#include "eventing.h"
     14#include "upnp.h"
     15#include "upnptaskevent.h"
     16
     17// C standard library
    1218#include <cmath>
    1319
     20// Qt
    1421#include <QTextCodec>
    1522#include <QTextStream>
    1623
    17 #include "upnp.h"
    18 #include "eventing.h"
    19 #include "upnptaskevent.h"
    2024
    2125/////////////////////////////////////////////////////////////////////////////
    2226//
  • mythtv/libs/libmythupnp/eventing.h

    diff --git a/mythtv/libs/libmythupnp/eventing.h b/mythtv/libs/libmythupnp/eventing.h
    index c497b5a..9aa918b 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef EVENTING_H_
    13 #define EVENTING_H_
     12#ifndef EVENTING_H
     13#define EVENTING_H
    1414
    1515#include <sys/time.h>
    1616
  • mythtv/libs/libmythupnp/httprequest.h

    diff --git a/mythtv/libs/libmythupnp/httprequest.h b/mythtv/libs/libmythupnp/httprequest.h
    index 8ef49ae..2916f0d 100644
    a b  
    88//                                                                           
    99//////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef HTTPREQUEST_H_
    12 #define HTTPREQUEST_H_
     11#ifndef HTTPREQUEST_H
     12#define HTTPREQUEST_H
    1313
    1414#include <QRegExp>
    1515#include <QTextStream>
  • mythtv/libs/libmythupnp/httpserver.cpp

    diff --git a/mythtv/libs/libmythupnp/httpserver.cpp b/mythtv/libs/libmythupnp/httpserver.cpp
    index cce3d07..8ccf4ff 100644
    a b  
    1010//                                                                           
    1111//////////////////////////////////////////////////////////////////////////////
    1212
     13// MythTV headers
     14#include "httpserver.h"
     15#include "upnputil.h"
     16#include "upnp.h" // only needed for Config... remove once config is moved.
     17#include "compat.h"
     18#include "mythdirs.h"
     19
    1320// ANSI C headers
    1421#include <cmath>
    1522
     
    2027#include <sys/utsname.h>
    2128#endif
    2229
    23 // MythTV headers
    24 #include "httpserver.h"
    25 #include "upnputil.h"
    26 #include "upnp.h" // only needed for Config... remove once config is moved.
    27 #include "compat.h"
    28 #include "mythdirs.h"
    2930
    3031/////////////////////////////////////////////////////////////////////////////
    3132/////////////////////////////////////////////////////////////////////////////
  • mythtv/libs/libmythupnp/httpserver.h

    diff --git a/mythtv/libs/libmythupnp/httpserver.h b/mythtv/libs/libmythupnp/httpserver.h
    index a6a9c67..7cc48ae 100644
    a b  
    1010//                                                                           
    1111//////////////////////////////////////////////////////////////////////////////
    1212
    13 #ifndef __HTTPSERVER_H__
    14 #define __HTTPSERVER_H__
     13#ifndef HTTPSERVER_H
     14#define HTTPSERVER_H
    1515
    1616// POSIX headers
    1717#include <sys/types.h>
  • mythtv/libs/libmythupnp/multicast.h

    diff --git a/mythtv/libs/libmythupnp/multicast.h b/mythtv/libs/libmythupnp/multicast.h
    index a9f2aec..f554003 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __MULTICAST_H__
    13 #define __MULTICAST_H__
     12#ifndef MULTICAST_H
     13#define MULTICAST_H
    1414
    1515// Qt headers
    1616#include <QtGlobal>
  • mythtv/libs/libmythupnp/mythxmlclient.h

    diff --git a/mythtv/libs/libmythupnp/mythxmlclient.h b/mythtv/libs/libmythupnp/mythxmlclient.h
    index a07c02d..e142969 100644
    a b  
    88//                                                                           
    99//////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef MYTHXMLCLIENT_H_
    12 #define MYTHXMLCLIENT_H_
     11#ifndef MYTHXMLCLIENT_H
     12#define MYTHXMLCLIENT_H
    1313
    1414#include <qdom.h>
    1515#include <qbuffer.h>
  • mythtv/libs/libmythupnp/refcounted.h

    diff --git a/mythtv/libs/libmythupnp/refcounted.h b/mythtv/libs/libmythupnp/refcounted.h
    index 61a19d4..e3e93d0 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __REFCOUNTED_H__
    13 #define __REFCOUNTED_H__
     12#ifndef REFCOUNTED_H
     13#define REFCOUNTED_H
    1414
    1515#include <qmutex.h>
    1616
  • mythtv/libs/libmythupnp/soapclient.cpp

    diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp
    index be0667b..c0f3a4f 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
     12// MythTV
     13#include "soapclient.h"
     14#include "httprequest.h"
     15#include <mythverbose.h>
     16
     17// Qt
    1218#include <qbuffer.h>
    1319
    14 #include "soapclient.h"
    1520
    16 #include "mythverbose.h"
    17 #include "httprequest.h"
    1821
    1922/////////////////////////////////////////////////////////////////////////////
    2023//
  • mythtv/libs/libmythupnp/soapclient.h

    diff --git a/mythtv/libs/libmythupnp/soapclient.h b/mythtv/libs/libmythupnp/soapclient.h
    index 8f99ea6..6c46ab3 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef SOAPCLIENT_H_
    13 #define SOAPCLIENT_H_
     12#ifndef SOAPCLIENT_H
     13#define SOAPCLIENT_H
    1414
    1515#include <qdom.h>
    1616
  • mythtv/libs/libmythupnp/ssdp.h

    diff --git a/mythtv/libs/libmythupnp/ssdp.h b/mythtv/libs/libmythupnp/ssdp.h
    index b79a3d6..56da1ec 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __SSDP_H__
    13 #define __SSDP_H__
     12#ifndef SSDP_H
     13#define SSDP_H
    1414
    1515#include <QThread>
    1616#include <QFile>
  • mythtv/libs/libmythupnp/ssdpcache.h

    diff --git a/mythtv/libs/libmythupnp/ssdpcache.h b/mythtv/libs/libmythupnp/ssdpcache.h
    index 2c6fd7b..9801923 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __SSDPCLIENT_H__
    13 #define __SSDPCLIENT_H__
     12#ifndef SSDPCACHE_H
     13#define SSDPCACHE_H
    1414
    1515#include "mythobservable.h"
    1616
  • mythtv/libs/libmythupnp/taskqueue.h

    diff --git a/mythtv/libs/libmythupnp/taskqueue.h b/mythtv/libs/libmythupnp/taskqueue.h
    index 0a6d099..320ff64 100644
    a b  
    88//                                                                           
    99//////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef __TASKQUEUE_H__
    12 #define __TASKQUEUE_H__
     11#ifndef TASKQUEUE_H
     12#define TASKQUEUE_H
    1313
    1414// POSIX headers
    1515#include <sys/types.h>
  • mythtv/libs/libmythupnp/threadpool.cpp

    diff --git a/mythtv/libs/libmythupnp/threadpool.cpp b/mythtv/libs/libmythupnp/threadpool.cpp
    index 782e446..d6df88b 100644
    a b  
    99//                                                                           
    1010/////////////////////////////////////////////////////////////////////////////
    1111
     12// MythTV
     13#include "threadpool.h"
     14#include "upnp.h"       // only needed for Config... remove once config is moved.
     15
     16// C++ standard library
    1217#include <algorithm>
    1318using namespace std;
    1419
    15 #include "threadpool.h"
    16 #include "upnp.h"       // only needed for Config... remove once config is moved.
    1720
    1821/////////////////////////////////////////////////////////////////////////////
    1922/////////////////////////////////////////////////////////////////////////////
  • mythtv/libs/libmythupnp/threadpool.h

    diff --git a/mythtv/libs/libmythupnp/threadpool.h b/mythtv/libs/libmythupnp/threadpool.h
    index 74e30a8..ec33825 100644
    a b  
    88//                                                                           
    99/////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef __THREADPOOL_H__
    12 #define __THREADPOOL_H__
     11#ifndef THREADPOOL_H
     12#define THREADPOOL_H
    1313
    1414#include <deque>
    1515using namespace std;
  • mythtv/libs/libmythupnp/upnp.h

    diff --git a/mythtv/libs/libmythupnp/upnp.h b/mythtv/libs/libmythupnp/upnp.h
    index f315dcb..26d0c0a 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNP_H__
    13 #define __UPNP_H__
     12#ifndef UPNP_H
     13#define UPNP_H
    1414
    1515
    1616
  • mythtv/libs/libmythupnp/upnpcds.cpp

    diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp
    index d0e8d5d..a8ce7b8 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #include <cmath>
    13 
    14 #include "upnp.h"
     12// MythTV
    1513#include "upnpcds.h"
     14#include "upnp.h"
    1615#include "upnputil.h"
    1716
     17// C standard library
     18#include <cmath>
     19
     20
    1821#define DIDL_LITE_BEGIN "<DIDL-Lite xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:upnp=\"urn:schemas-upnp-org:metadata-1-0/upnp/\" xmlns=\"urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/\">"
    1922#define DIDL_LITE_END   "</DIDL-Lite>";
    2023
  • mythtv/libs/libmythupnp/upnpcds.h

    diff --git a/mythtv/libs/libmythupnp/upnpcds.h b/mythtv/libs/libmythupnp/upnpcds.h
    index 2a4ca2f..6d52124 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef UPnpCDS_H_
    13 #define UPnpCDS_H_
     12#ifndef UPNPCDS_H
     13#define UPNPCDS_H
    1414
    1515#include <QList>
    1616#include <QObject>
  • mythtv/libs/libmythupnp/upnpcdsobjects.h

    diff --git a/mythtv/libs/libmythupnp/upnpcdsobjects.h b/mythtv/libs/libmythupnp/upnpcdsobjects.h
    index 557bf53..6b8dc6d 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNPCDSOBJECTS_H_
    13 #define __UPNPCDSOBJECTS_H_
     12#ifndef UPNPCDSOBJECTS_H
     13#define UPNPCDSOBJECTS_H
    1414
    1515#include <QDateTime>
    1616#include <QString>
  • mythtv/libs/libmythupnp/upnpcmgr.cpp

    diff --git a/mythtv/libs/libmythupnp/upnpcmgr.cpp b/mythtv/libs/libmythupnp/upnpcmgr.cpp
    index 66f3057..716c7d8 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #include "upnp.h"
    1312#include "upnpcmgr.h"
     13#include "upnp.h"
    1414
    1515/////////////////////////////////////////////////////////////////////////////
    1616//
  • mythtv/libs/libmythupnp/upnpcmgr.h

    diff --git a/mythtv/libs/libmythupnp/upnpcmgr.h b/mythtv/libs/libmythupnp/upnpcmgr.h
    index 48c5499..9ff0d16 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef UPnpCMGR_H_
    13 #define UPnpCMGR_H_
     12#ifndef UPNPCMGR_H
     13#define UPNPCMGR_H
    1414
    1515#include "httpserver.h"
    1616#include "eventing.h"
  • mythtv/libs/libmythupnp/upnpdevice.cpp

    diff --git a/mythtv/libs/libmythupnp/upnpdevice.cpp b/mythtv/libs/libmythupnp/upnpdevice.cpp
    index a6ce02f..a22e299 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #include "upnp.h"
     12//MythTV
    1313#include "upnpdevice.h"
     14#include "upnp.h"
    1415#include "httpcomms.h"
    1516
    16 #include <unistd.h>
     17// C standard library
    1718#include <cerrno>
    1819
    19 #include <qfile.h>
     20// POSIX
     21#include <unistd.h>
     22
     23// Qt
     24#include <QFile>
    2025#include <QTextStream>
    2126
    2227int DeviceLocation::g_nAllocated   = 0;       // Debugging only
  • mythtv/libs/libmythupnp/upnpdevice.h

    diff --git a/mythtv/libs/libmythupnp/upnpdevice.h b/mythtv/libs/libmythupnp/upnpdevice.h
    index 2368eae..c8c406e 100644
    a b  
    88// Created By  : David Blain                    Created On : Oct. 24, 2005
    99//////////////////////////////////////////////////////////////////////////////
    1010
    11 #ifndef __UPNPDEVICE_H__
    12 #define __UPNPDEVICE_H__
     11#ifndef UPNPDEVICE_H
     12#define UPNPDEVICE_H
    1313
    1414#include <sys/time.h>
    1515
  • mythtv/libs/libmythupnp/upnpimpl.h

    diff --git a/mythtv/libs/libmythupnp/upnpimpl.h b/mythtv/libs/libmythupnp/upnpimpl.h
    index b0ba74f..07fef7f 100644
    a b  
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    1212
    13 #ifndef __UPNPIMPL_H__
    14 #define __UPNPIMPL_H__
     13#ifndef UPNPIMPL_H
     14#define UPNPIMPL_H
    1515
    1616#include "upnpdevice.h"
    1717
  • mythtv/libs/libmythupnp/upnpmsrr.cpp

    diff --git a/mythtv/libs/libmythupnp/upnpmsrr.cpp b/mythtv/libs/libmythupnp/upnpmsrr.cpp
    index 146fac8..bca96fb 100644
    a b  
    77//
    88//////////////////////////////////////////////////////////////////////////////
    99
    10 #include "upnp.h"
     10// MythTV
    1111#include "upnpmsrr.h"
     12#include "upnp.h"
     13
     14// C/C++ standard library
     15#include <cmath>
    1216
    13 #include <math.h>
     17// Qt
    1418#include <qregexp.h>
    1519
    1620/////////////////////////////////////////////////////////////////////////////
  • mythtv/libs/libmythupnp/upnpmsrr.h

    diff --git a/mythtv/libs/libmythupnp/upnpmsrr.h b/mythtv/libs/libmythupnp/upnpmsrr.h
    index ac27e61..7e3b6c0 100644
    a b  
    1 #ifndef UPnpMSRR_H_
    2 #define UPnpMSRR_H_
     1#ifndef UPNPMSRR_H
     2#define UPNPMSRR_H
    33
    44#include <qdom.h>
    55#include <qdatetime.h>
  • mythtv/libs/libmythupnp/upnptaskcache.h

    diff --git a/mythtv/libs/libmythupnp/upnptaskcache.h b/mythtv/libs/libmythupnp/upnptaskcache.h
    index 6e51cd7..3173740 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNPTASKCACHE_H__
    13 #define __UPNPTASKCACHE_H__
     12#ifndef UPNPTASKCACHE_H
     13#define UPNPTASKCACHE_H
    1414
    1515#include "upnp.h"
    1616
  • mythtv/libs/libmythupnp/upnptaskevent.h

    diff --git a/mythtv/libs/libmythupnp/upnptaskevent.h b/mythtv/libs/libmythupnp/upnptaskevent.h
    index 305b431..f35ab32 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNPTASKEVENT_H__
    13 #define __UPNPTASKEVENT_H__
     12#ifndef UPNPTASKEVENT_H
     13#define UPNPTASKEVENT_H
    1414
    1515#include "upnp.h"
    1616#include "bufferedsocketdevice.h"
  • mythtv/libs/libmythupnp/upnptasknotify.h

    diff --git a/mythtv/libs/libmythupnp/upnptasknotify.h b/mythtv/libs/libmythupnp/upnptasknotify.h
    index 4b8a6ee..5d0892e 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNPTASKNOTIFY_H__
    13 #define __UPNPTASKNOTIFY_H__
     12#ifndef UPNPTASKNOTIFY_H
     13#define UPNPTASKNOTIFY_H
    1414
    1515// POSIX headers
    1616#include <sys/types.h>
  • mythtv/libs/libmythupnp/upnptasksearch.cpp

    diff --git a/mythtv/libs/libmythupnp/upnptasksearch.cpp b/mythtv/libs/libmythupnp/upnptasksearch.cpp
    index c78dc0e..2cf928e 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
     12// MythUPNP
     13#include "upnptasksearch.h"
     14#include "upnp.h"
     15
     16// MythDB
     17#include <compat.h>
     18
     19// C/C++ standard library
     20#include <cstdlib>
     21
     22// POSIX
    1223#include <unistd.h>
    13 #include <stdlib.h>
    1424#include <sys/time.h>
    1525
     26// Qt
    1627#include <QStringList>
    1728#include <QFile>
    1829
    19 #include "upnp.h"
    20 #include "upnptasksearch.h"
    21 #include "compat.h"
    22 
    2330/////////////////////////////////////////////////////////////////////////////
    2431/////////////////////////////////////////////////////////////////////////////
    2532//
  • mythtv/libs/libmythupnp/upnptasksearch.h

    diff --git a/mythtv/libs/libmythupnp/upnptasksearch.h b/mythtv/libs/libmythupnp/upnptasksearch.h
    index 12bd320..005c211 100644
    a b  
    99//                                                                           
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 #ifndef __UPNPTASKSEARCH_H__
    13 #define __UPNPTASKSEARCH_H__
     12#ifndef UPNPTASKSEARCH_H
     13#define UPNPTASKSEARCH_H
    1414
    1515// POSIX headers
    1616#include <sys/types.h>
  • mythtv/libs/libmythupnp/upnputil.cpp

    diff --git a/mythtv/libs/libmythupnp/upnputil.cpp b/mythtv/libs/libmythupnp/upnputil.cpp
    index eeb30a0..d66dcb9 100644
    a b  
    99//
    1010//////////////////////////////////////////////////////////////////////////////
    1111
    12 // POSIX headers
    13 #include <sys/types.h>
    14 #include <sys/time.h>
    15 #include <cerrno>
    16 
    17 // Qt headers
    18 #include <quuid.h>
    19 
    2012// MythTV headers
    2113#include "upnputil.h"
    2214#include "upnp.h"
    2315#include "compat.h"
    2416#include "mythconfig.h" // for HAVE_GETIFADDRS
    2517
    26 // POSIX headers 2, needs to be after compat.h for OS X
     18// C/C++ standard library
     19#include <cerrno>
     20
     21// POSIX headers
     22#include <sys/types.h>
     23#include <sys/time.h>
     24// Needed after compat.h for OS X
    2725#ifndef USING_MINGW
    2826#include <net/if.h>
    2927#include <sys/ioctl.h>
     
    3230#include <ifaddrs.h>
    3331#endif
    3432
     33// Qt headers
     34#include <quuid.h>
     35
    3536/////////////////////////////////////////////////////////////////////////////
    3637//
    3738/////////////////////////////////////////////////////////////////////////////
  • mythtv/libs/libmythupnp/upnputil.h

    diff --git a/mythtv/libs/libmythupnp/upnputil.h b/mythtv/libs/libmythupnp/upnputil.h
    index db6ee42..9cb5887 100644
    a b  
    1010//                                                                           
    1111//////////////////////////////////////////////////////////////////////////////
    1212
    13 #ifndef __UPNPUTIL_H__
    14 #define __UPNPUTIL_H__
     13#ifndef UPNPUTIL_H
     14#define UPNPUTIL_H
    1515
    1616#include <QStringList>
    1717#include <QMap>