Switch to unified view

a/src/main.cxx b/src/main.cxx
...
...
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
/////////////////////////////////////////////////////////////////////
17
/////////////////////////////////////////////////////////////////////
18
// Main program
18
// Main program
19
#define UPMPDCLI_NEED_PACKAGE_VERSION
20
#include "config.h"
19
21
20
#include <errno.h>             
22
#include <errno.h>             
21
#include <fcntl.h>             
23
#include <fcntl.h>             
22
#include <pwd.h>               
24
#include <pwd.h>               
23
#include <signal.h>            
25
#include <signal.h>            
...
...
33
#include <vector>              
35
#include <vector>              
34
36
35
#include "libupnpp/log.hxx"    
37
#include "libupnpp/log.hxx"    
36
#include "libupnpp/upnpplib.hxx"
38
#include "libupnpp/upnpplib.hxx"
37
#include "execmd.h"
39
#include "execmd.h"
38
#include "conftree.hxx"
40
#include "conftree.h"
39
#include "mpdcli.hxx"
41
#include "mpdcli.hxx"
40
#include "upmpd.hxx"
42
#include "upmpd.hxx"
41
#include "httpfs.hxx"
43
#include "httpfs.hxx"
42
#include "upmpdutils.hxx"
44
#include "upmpdutils.hxx"
45
#include "pathut.h"
43
46
44
using namespace std;
47
using namespace std;
45
using namespace UPnPP;
48
using namespace UPnPP;
46
49
47
static char *thisprog;
50
static char *thisprog;
...
...
111
        ""                                          // imageUri
114
        ""                                          // imageUri
112
    },
115
    },
113
    // Product
116
    // Product
114
    {
117
    {
115
        "Upmpdcli",                                 // name
118
        "Upmpdcli",                                 // name
116
        PACKAGE_VERSION,                            // info
119
        UPMPDCLI_PACKAGE_VERSION,                            // info
117
        "",                                         // url
120
        "",                                         // url
118
        ""                                          // imageUri
121
        ""                                          // imageUri
119
    }
122
    }
120
};
123
};
121
124