Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-15 17:37:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian compatibility fixing for patched-up upnp 1.6.17

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-08-19 19:32:05 +00:00
parent 531966f3c9
commit e34ca140ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretroshare/src/upnp/UPnPBase.cpp
View File

@ -1477,7 +1477,7 @@ upnpEventSubscriptionExpired:
int TimeOut = 1801; int TimeOut = 1801;
int ret = UpnpSubscribe( int ret = UpnpSubscribe(
upnpCP->m_UPnPClientHandle, upnpCP->m_UPnPClientHandle,
#if UPNP_VERSION >= 10800 #if DEBIAN && UPNP_VERSION >= 10617 || UPNP_VERSION >= 10800
UpnpString_get_String(es_event->PublisherUrl), UpnpString_get_String(es_event->PublisherUrl),
#else #else
es_event->PublisherUrl, es_event->PublisherUrl,
@ -1490,7 +1490,7 @@ upnpEventSubscriptionExpired:
msg, es_event->ErrCode, NULL, NULL); msg, es_event->ErrCode, NULL, NULL);
} else { } else {
ServiceMap::iterator it = ServiceMap::iterator it =
#if UPNP_VERSION >= 10800 #if DEBIAN && UPNP_VERSION >= 10617 || UPNP_VERSION >= 10800
upnpCP->m_ServiceMap.find(UpnpString_get_String(es_event->PublisherUrl)); upnpCP->m_ServiceMap.find(UpnpString_get_String(es_event->PublisherUrl));
#else #else
upnpCP->m_ServiceMap.find(es_event->PublisherUrl); upnpCP->m_ServiceMap.find(es_event->PublisherUrl);
@ -1500,7 +1500,7 @@ upnpEventSubscriptionExpired:
service.SetTimeout(TimeOut); service.SetTimeout(TimeOut);
service.SetSID(newSID); service.SetSID(newSID);
std::cerr << "CUPnPControlPoint::Callback() Re-subscribed to EventURL '" << std::cerr << "CUPnPControlPoint::Callback() Re-subscribed to EventURL '" <<
#if UPNP_VERSION >= 10800 #if DEBIAN && UPNP_VERSION >= 10617 || UPNP_VERSION >= 10800
UpnpString_get_String(es_event->PublisherUrl) << UpnpString_get_String(es_event->PublisherUrl) <<
#else #else
es_event->PublisherUrl << es_event->PublisherUrl <<