d2d-conv-manager: fix PRODUCT TV macro name 78/111278/1
authorHongkuk, Son <hongkuk.son@samsung.com>
Fri, 20 Jan 2017 05:23:59 +0000 (14:23 +0900)
committerHongkuk Son <hongkuk.son@samsung.com>
Fri, 20 Jan 2017 05:26:59 +0000 (21:26 -0800)
TIZEN_TV_PRODUCT -> TIZEN_PRODUCT_TV

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Ifa86f4273ee83c997b0b854767e517f71004988e

daemon/Util.cpp
daemon/discovery_provider/WifiDirectDiscoveryProvider.cpp

index 69ce3cd..597ce57 100755 (executable)
@@ -70,7 +70,7 @@ std::string conv::util::getBtMacAddress()
 std::string conv::util::getDeviceName()
 {
        std::string __deviceName;
-#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_TV_PRODUCT)
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_PRODUCT_TV)
        char* deviceName = vconf_get_str("db/menu/network/devicename/tv_name");
 #else
        char* deviceName = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
@@ -176,7 +176,7 @@ std::string conv::util::getDeviceId()
                __deviceId = Service::getUniqueId("127.0.0.1:8001");
 
                if(__deviceId.empty())
-#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_TV_PRODUCT)
+#if defined(_TV_) || defined(TIZEN_PROFILE_TV) || defined(TIZEN_TV) || defined(TIZEN_PRODUCT_TV)
                        __deviceId = getBtMacAddress();
 #else
                        __deviceId = getP2pMacAddress();
index 75b6b51..9816c20 100755 (executable)
@@ -266,10 +266,10 @@ 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);
 
-#if defined(TIZEN_TV) && defined(TIZEN_TV_PRODUCT) && 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_TV_PRODUCT) && defined(ENABLE_EXTRA_INFO) */
+#endif /* defined(TIZEN_TV) && defined(TIZEN_PRODUCT_TV) && defined(ENABLE_EXTRA_INFO) */
 
        return ret;
 }