From d0afe530604fdfdddf7d74a73216cc8f0df0327b Mon Sep 17 00:00:00 2001 From: Sachin Agrawal Date: Thu, 4 Sep 2014 18:27:02 -0700 Subject: [PATCH] Fixing broken TB stack due to compilation errors for Arduino platforms. Change-Id: Id211b8f03ddb07dd8c50148ece513bd2548b447f --- csdk/occoap/src/occoap.c | 2 +- csdk/stack/src/ocstack.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/csdk/occoap/src/occoap.c b/csdk/occoap/src/occoap.c index 018d840..33a8219 100644 --- a/csdk/occoap/src/occoap.c +++ b/csdk/occoap/src/occoap.c @@ -578,7 +578,7 @@ OCStackResult OCDoCoAPResource(OCMethod method, OCQualityOfService qos, OCCoAPTo } VERIFY_SUCCESS(FormOptionList(&optList, NULL, NULL, 0, NULL, - &uri.port, uri.path.length, uri.path.s, uri.query.length, + (uint16_t*)&uri.port, uri.path.length, uri.path.s, uri.query.length, uri.query.s), OC_STACK_OK); OC_LOG_V(DEBUG, TAG, "uri.host.s %s", uri.host.s); diff --git a/csdk/stack/src/ocstack.c b/csdk/stack/src/ocstack.c index fdedd1e..dfc07fd 100644 --- a/csdk/stack/src/ocstack.c +++ b/csdk/stack/src/ocstack.c @@ -1350,11 +1350,11 @@ OCStackResult OCChangeResourceProperty(OCResourceProperty * inputProperty, } if(!enable) { - *inputProperty = *inputProperty & ~(resourceProperties); + *inputProperty = (OCResourceProperty) (*inputProperty & ~(resourceProperties)); } else { - *inputProperty = *inputProperty | resourceProperties; + *inputProperty = (OCResourceProperty) (*inputProperty | resourceProperties); } return OC_STACK_OK; } -- 2.7.4