From: sungwook79.park <sungwook79.park@samsung.com>
Date: Wed, 26 Apr 2017 10:42:50 +0000 (+0900)
Subject: Fix redefine issue in header
X-Git-Tag: accepted/tizen/unified/20170518.184014~10
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Finputdelegator.git;a=commitdiff_plain;h=f17c7dd8a405cb2a7e62278476827613a2264d8e

Fix redefine issue in header

Change-Id: I7cac7c48649231a450877cc5d8f88ea098258353
Signed-off-by: sungwook79.park <sungwook79.park@samsung.com>
---

diff --git a/inc/MoreOption.h b/inc/MoreOption.h
index 70843ab..f410d52 100755
--- a/inc/MoreOption.h
+++ b/inc/MoreOption.h
@@ -26,9 +26,7 @@ class MoreOption
 {
 	Evas_Object *nf;
 	Evas_Object *more_option_layout;
-#ifdef _WEARABLE
 	Eext_Object_Item *item;
-#endif
 	Eina_Bool option_opened;
 	void *voicedata;
 
diff --git a/inc/w-input-selector.h b/inc/w-input-selector.h
index 9c3d323..2e86d7b 100755
--- a/inc/w-input-selector.h
+++ b/inc/w-input-selector.h
@@ -65,9 +65,15 @@ typedef enum {
    TIZEN_PROFILE_COMMON = 0x10,
 } tizen_profile_t;
 extern tizen_profile_t _get_tizen_profile();
+#if !defined(_TV)
 #define _TV (_get_tizen_profile() == TIZEN_PROFILE_TV)
+#endif
+#if !defined(_MOBILE)
 #define _MOBILE (_get_tizen_profile() == TIZEN_PROFILE_MOBILE)
+#endif
+#if !defined(_WEARABLE)
 #define _WEARABLE (_get_tizen_profile() == TIZEN_PROFILE_WEARABLE)
+#endif
 
 typedef struct appdata{
 	Evas_Object* win_main;
@@ -75,9 +81,7 @@ typedef struct appdata{
 	Evas_Object* conform;
 	Evas_Object* naviframe;
 	Evas_Object* genlist;
-#ifdef _WEARABLE
 	Eext_Circle_Surface *circle_surface;
-#endif
 
 	app_control_h source_app_control;
 	int app_type;
diff --git a/src/MoreOption.cpp b/src/MoreOption.cpp
index 2510f0b..6b12f6e 100755
--- a/src/MoreOption.cpp
+++ b/src/MoreOption.cpp
@@ -36,9 +36,7 @@ extern Evas_Object *g_setting_window;
 MoreOption::MoreOption(Evas_Object *naviframe, void* voicedata)
 	: nf(naviframe)
 	, more_option_layout(NULL)
-#ifdef _WEARABLE
 	, item(NULL)
-#endif
 	, option_opened(EINA_FALSE)
 	, voicedata(voicedata) {
 	/** todo. implement constructor */