SF Bug Tracker id 3510693 - build fail with --disable-device
GetDeviceHandleInfo just fail without using undefined member DeviceAf if UPNP_HAVE_DEVICE is not defined. Move ContentTypeHeader definition to soap_common.c, since it is also used in soap_ctrlpt.c.
This commit is contained in:
parent
19ec877b2a
commit
679ebeec48
@ -2,6 +2,14 @@
|
|||||||
Version 1.6.17
|
Version 1.6.17
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
|
|
||||||
|
2012-03-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
|
||||||
|
|
||||||
|
SF Bug Tracker id 3510693 - build fail with --disable-device
|
||||||
|
|
||||||
|
GetDeviceHandleInfo just fail without using undefined member DeviceAf
|
||||||
|
if UPNP_HAVE_DEVICE is not defined.
|
||||||
|
Move ContentTypeHeader definition to soap_common.c, since it is
|
||||||
|
also used in soap_ctrlpt.c.
|
||||||
|
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
Version 1.6.16
|
Version 1.6.16
|
||||||
|
@ -3729,6 +3729,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
|
||||||
/* 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)) {
|
||||||
@ -3748,6 +3749,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* UPNP_HAVE_DEVICE */
|
||||||
|
|
||||||
*device_handle_out = -1;
|
*device_handle_out = -1;
|
||||||
return HND_INVALID;
|
return HND_INVALID;
|
||||||
|
@ -6,5 +6,8 @@
|
|||||||
#include "sock.h"
|
#include "sock.h"
|
||||||
#include "soaplib.h"
|
#include "soaplib.h"
|
||||||
|
|
||||||
|
const char *ContentTypeHeader =
|
||||||
|
"CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
|
||||||
|
|
||||||
#endif /* EXCLUDE_SOAP */
|
#endif /* EXCLUDE_SOAP */
|
||||||
|
|
||||||
|
@ -73,9 +73,6 @@ static const char *Soap_Invalid_Action = "Invalid Action";
|
|||||||
static const char *Soap_Action_Failed = "Action Failed";
|
static const char *Soap_Action_Failed = "Action Failed";
|
||||||
static const char *Soap_Invalid_Var = "Invalid Var";
|
static const char *Soap_Invalid_Var = "Invalid Var";
|
||||||
|
|
||||||
const char *ContentTypeHeader =
|
|
||||||
"CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief This function retrives the name of the SOAP action.
|
* \brief This function retrives the name of the SOAP action.
|
||||||
*
|
*
|
||||||
|
Loading…
Reference in New Issue
Block a user