From: Joseph Morrow <joseph.l.morrow@intel.com>
Date: Mon, 9 Mar 2015 17:54:15 +0000 (-0400)
Subject: Fixed issues that are warnings on Linux, but errors on Arduino.
X-Git-Tag: 1.2.0+RC1~1855^2~121
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d29dafd25923247b2a2296cc2417ac7c02309012;p=platform%2Fupstream%2Fiotivity.git

Fixed issues that are warnings on Linux, but errors on Arduino.

Change-Id: Ibbc1d31e64e5aad711dc576c517c7665f622f40f
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
Reviewed-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>
---

diff --git a/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c b/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c
index 898e5b4..6211f2d 100644
--- a/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c
+++ b/resource/csdk/connectivity/src/cainterfacecontroller_singlethread.c
@@ -29,6 +29,7 @@
 #include "caethernetadapter_singlethread.h"
 #include "caedradapter_singlethread.h"
 #include "caleadapter_singlethread.h"
+#include "caadapterutils.h"
 
 #include "canetworkconfigurator.h"
 #include "oic_malloc.h"
diff --git a/resource/csdk/security/src/ocsecurity.c b/resource/csdk/security/src/ocsecurity.c
index b9eccb6..e8db4cc 100644
--- a/resource/csdk/security/src/ocsecurity.c
+++ b/resource/csdk/security/src/ocsecurity.c
@@ -108,7 +108,7 @@ void GetDtlsPskCredentials(OCDtlsPskCredsBlob **credInfo)
                         }
                     }
                 }
-                *credInfo = caBlob;
+                *credInfo = (OCDtlsPskCredsBlob *) caBlob;
                 break;
 #else
                 OCDtlsPskCredsBlob * blob;
diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c
index 2c85307..669dd6c 100644
--- a/resource/csdk/stack/src/ocserverrequest.c
+++ b/resource/csdk/stack/src/ocserverrequest.c
@@ -415,7 +415,7 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse)
     //Sending response on all n/w interfaces
     for(int i = 0; i < size; i++ )
     {
-        responseEndpoint.connectivityType = connType & CAConnTypes[i];
+        responseEndpoint.connectivityType = (CAConnectivityType_t)(connType & CAConnTypes[i]);
         if(responseEndpoint.connectivityType)
         {
             //The result is set to OC_STACK_OK only if CASendResponse succeeds in sending the