From: Veeraj Khokale <veeraj.sk@samsung.com>
Date: Tue, 27 Sep 2016 05:45:45 +0000 (+0530)
Subject: Fix for Tizen BLE build
X-Git-Tag: 1.3.0~1057^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fcc51ded02abbd1e1f71680b61a2a92dd572c8b;p=platform%2Fupstream%2Fiotivity.git

Fix for Tizen BLE build

Changed CAWaitResult_t to OCWaitResult_t in tizen caleclient.c
to fix the build error.

Change-Id: I46881f5c0a496babae1bc5adcb05d630ac58024f
Signed-off-by: Veeraj Khokale <veeraj.sk@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12259
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
---

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
index dc33e14..325e6ef 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleclient.c
@@ -448,7 +448,7 @@ void CAStartTimerThread(void *data)
         }
 
         // Timed conditional wait for stopping the scan.
-        CAWaitResult_t ret = oc_cond_wait_for(g_scanningTimeCond, g_multicastDataListMutex,
+        OCWaitResult_t ret = oc_cond_wait_for(g_scanningTimeCond, g_multicastDataListMutex,
                                               TIMEOUT);
         if (OC_WAIT_TIMEDOUT == ret)
         {