From: MyungJoo Ham Date: Mon, 23 Jan 2017 08:27:21 +0000 (+0900) Subject: Fix: ifdef logic error + runtime profile determination X-Git-Tag: accepted/tizen/common/20170221.134913~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fa518f42900dbc2827303a010f40283daefa7e3;p=platform%2Fcore%2Fconvergence%2Fd2d-conv-manager.git Fix: ifdef logic error + runtime profile determination Change-Id: Ie99001670d3c28ae458571c841ca6bda1c9a3caf CC: Jihoon Park Signed-off-by: MyungJoo Ham --- diff --git a/daemon/discovery_provider/WifiDirectDiscoveryProvider.cpp b/daemon/discovery_provider/WifiDirectDiscoveryProvider.cpp index 699c310..c1a2c59 100755 --- a/daemon/discovery_provider/WifiDirectDiscoveryProvider.cpp +++ b/daemon/discovery_provider/WifiDirectDiscoveryProvider.cpp @@ -266,11 +266,15 @@ int init_wfd_client(void* disc_provider) ret = wifi_direct_set_connection_state_changed_cb(_cb_connection, (void*)NULL); _D("wifi_direct_set_connection_state_changed_cb() result=[%d]", ret); -// CAUTION: TIZEN_TV and TIZEN_TV_PRODUCT has been deadcode in Tizen.org -#if defined(TIZEN_TV) && defined(TIZEN_PRODUCT_TV) && defined(ENABLE_EXTRA_INFO) +#if defined(TIZEN_TV) || defined(TIZEN_PRODUCT_TV) || defined(ENABLE_EXTRA_INFO) ret = wifi_direct_set_peer_info_connection_state_changed_cb(_cb_peer_info_connection, (void*)NULL); _D("wifi_direct_set_peer_info_connection_state_changed_cb() result=[%d]", ret); -#endif /* defined(TIZEN_TV) && defined(TIZEN_PRODUCT_TV) && defined(ENABLE_EXTRA_INFO) */ +#else + if (conv::util::getTizenProfile() == conv::util::TIZEN_PROFILE_TV) { + ret = wifi_direct_set_peer_info_connection_state_changed_cb(_cb_peer_info_connection, (void*)NULL); + _D("wifi_direct_set_peer_info_connection_state_changed_cb() result=[%d]", ret); + } +#endif /* defined(TIZEN_TV) || defined(TIZEN_PRODUCT_TV) || defined(ENABLE_EXTRA_INFO) */ return ret; }