generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SF Bug Tracker id 3510693 - build fail with --disable-device

Browse Source 
Use INCLUDE_DEVICE_APIS instead of UPNP_HAVE_DEVICE as in other sources.
Don't use soap_device_callback if INCLUDE_DEVICE_APIS is not set,
otherwise link error occur on Windows.
This commit is contained in:
Yoichi NAKAYAMA 2012-03-27 00:59:50 +09:00
parent 02afbb09c9
commit e0e81e6cd2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -2,6 +2,14 @@
Version 1.6.17 Version 1.6.17
******************************************************************************* *******************************************************************************
2012-03-26 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
SF Bug Tracker id 3510693 - build fail with --disable-device
Use INCLUDE_DEVICE_APIS instead of UPNP_HAVE_DEVICE as in other sources.
Don't use soap_device_callback if INCLUDE_DEVICE_APIS is not set,
otherwise link error occur on Windows.
2012-03-26 Fabrice Fontaine <fabrice.fontaine(at)orange.com> 2012-03-26 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
SF Bug Tracker id 3511149 - --disable-ssdp has no effect SF Bug Tracker id 3511149 - --disable-ssdp has no effect

6
upnp/src/api/upnpapi.c
View File

@ -358,9 +358,11 @@ static int UpnpInitPreamble(void)
return retVal; return retVal;
} }
#ifdef INCLUDE_DEVICE_APIS
#if EXCLUDE_SOAP == 0 #if EXCLUDE_SOAP == 0
SetSoapCallback(soap_device_callback); SetSoapCallback(soap_device_callback);
#endif #endif
#endif /* INCLUDE_DEVICE_APIS */
#if EXCLUDE_GENA == 0 #if EXCLUDE_GENA == 0
SetGenaCallback(genaCallback); SetGenaCallback(genaCallback);
@ -3729,7 +3731,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
UpnpDevice_Handle *device_handle_out, UpnpDevice_Handle *device_handle_out,
struct Handle_Info **HndInfo) struct Handle_Info **HndInfo)
{ {
#ifdef UPNP_HAVE_DEVICE #ifdef INCLUDE_DEVICE_APIS
/* Check if we've got a registered device of the address family specified. */ /* Check if we've got a registered device of the address family specified. */
if ((AddressFamily == AF_INET && UpnpSdkDeviceRegisteredV4 == 0) || if ((AddressFamily == AF_INET && UpnpSdkDeviceRegisteredV4 == 0) ||
(AddressFamily == AF_INET6 && UpnpSdkDeviceregisteredV6 == 0)) { (AddressFamily == AF_INET6 && UpnpSdkDeviceregisteredV6 == 0)) {
@ -3749,7 +3751,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
break; break;
} }
} }
#endif /* UPNP_HAVE_DEVICE */ #endif /* INCLUDE_DEVICE_APIS */
*device_handle_out = -1; *device_handle_out = -1;
return HND_INVALID; return HND_INVALID;