From: Jaehong Jo <jaehong.jo@samsung.com>
Date: Fri, 19 Feb 2016 02:43:57 +0000 (+0900)
Subject: Fix tizen build issue.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fa23de697a88b1b30d9d18b56a02ea65b27c0ba;p=contrib%2Fiotivity.git

Fix tizen build issue.

Duplicate define GMainLoopThread in EDR, LE.

Change-Id: Ie6757412d8741be801e30b7f29744dc33bd68d51
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c
index dd3e11d..1c7dd6b 100644
--- a/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/tizen/caedrnwmonitor.c
@@ -51,7 +51,7 @@ static CAEDRNetworkStatusCallback g_edrNetworkChangeCallback = NULL;
 static void CAEDRAdapterStateChangeCallback(int result, bt_adapter_state_e adapterState,
                                             void *userData);
 
-void *GMainLoopThread (void *param)
+void *CAEDRMainLoopThread (void *param)
 {
     g_main_loop_run(g_mainloop);
     return NULL;
@@ -88,7 +88,7 @@ CAResult_t CAEDRStartNetworkMonitor()
         return CA_STATUS_FAILED;
     }
 
-    if (CA_STATUS_OK != ca_thread_pool_add_task(g_threadPoolHandle, GMainLoopThread, (void *) NULL))
+    if (CA_STATUS_OK != ca_thread_pool_add_task(g_threadPoolHandle, CAEDRMainLoopThread, (void *) NULL))
     {
         OIC_LOG(ERROR, EDR_ADAPTER_TAG, "Failed to create thread!");
         return CA_STATUS_FAILED;
diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
index 1f5ae82..5bf9e29 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/calenwmonitor.c
@@ -69,7 +69,7 @@ static ca_mutex g_bleDeviceStateChangedCbMutex = NULL;
 void CALEAdapterStateChangedCb(int result, bt_adapter_state_e adapter_state,
                         void *user_data);
 
-void *GMainLoopThread (void *param)
+void *CALEMainLoopThread (void *param)
 {
     g_main_loop_run(g_mainloop);
     return NULL;
@@ -121,7 +121,7 @@ CAResult_t CAStartLEAdapter()
         return CA_STATUS_FAILED;
     }
 
-    if (CA_STATUS_OK != ca_thread_pool_add_task(g_threadPoolHandle, GMainLoopThread, (void *) NULL))
+    if (CA_STATUS_OK != ca_thread_pool_add_task(g_threadPoolHandle, CALEMainLoopThread, (void *) NULL))
     {
         OIC_LOG(ERROR, TAG, "Failed to create thread!");
         return CA_STATUS_FAILED;