From: Sachin Agrawal <sachin.agrawal@intel.com>
Date: Fri, 5 Sep 2014 01:27:02 +0000 (-0700)
Subject: Fixing broken TB stack due to compilation errors for Arduino platforms.
X-Git-Tag: 1.2.0+RC1~2281
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0afe530604fdfdddf7d74a73216cc8f0df0327b;p=platform%2Fupstream%2Fiotivity.git

Fixing broken TB stack due to compilation errors for Arduino platforms.

Change-Id: Id211b8f03ddb07dd8c50148ece513bd2548b447f
---

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;
 }