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);
__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();
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;
}