Switch to unified view

a/libupnpp/control/service.cxx b/libupnpp/control/service.cxx
...
...
38
#if UPNP_VERSION_MINOR < 8 && !defined(UpnpEvent_get_SID_cstr)
38
#if UPNP_VERSION_MINOR < 8 && !defined(UpnpEvent_get_SID_cstr)
39
typedef struct Upnp_Event UpnpEvent;
39
typedef struct Upnp_Event UpnpEvent;
40
#define UpnpEvent_get_SID_cstr(x) ((x)->Sid)
40
#define UpnpEvent_get_SID_cstr(x) ((x)->Sid)
41
#define UpnpEvent_get_EventKey(x) ((x)->EventKey)
41
#define UpnpEvent_get_EventKey(x) ((x)->EventKey)
42
#define UpnpEvent_get_ChangedVariables(x) ((x)->ChangedVariables)
42
#define UpnpEvent_get_ChangedVariables(x) ((x)->ChangedVariables)
43
#endif
44
45
#if UPNP_VERSION_MAJOR > 1 || (UPNP_VERSION_MAJOR==1 && UPNP_VERSION_MINOR >= 8)
43
#define CBCONST const
46
#define CBCONST const
44
#else
47
#else
45
#define CBCONST
48
#define CBCONST 
46
#endif
49
#endif
47
50
48
namespace UPnPClient {
51
namespace UPnPClient {
49
static bool initEvents();
52
static bool initEvents();
50
static int srvCB(Upnp_EventType et, CBCONST void* vevp, void*);
53
static int srvCB(Upnp_EventType et, CBCONST void* vevp, void*);