Remove HAVE_WL_DRM definition check in input system 80/73980/5
authorJeongHyun Kang <jhyuni.kang@samsung.com>
Fri, 10 Jun 2016 08:32:08 +0000 (17:32 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Tue, 14 Jun 2016 02:18:13 +0000 (19:18 -0700)
Change-Id: I431bdf822a6b4a7ee8ab2b0bfe7230a2517e9318

src/bin/e_comp_wl_input.c
src/bin/e_mouse.c

index 45c5dee7834e50b1fc2e5022651cb0a01e5d662a..6e7d60269f936f92ec2da052592d48d54697ec2e 100644 (file)
@@ -1,9 +1,7 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
 #include <sys/mman.h>
-#ifdef HAVE_WL_DRM
 #include <Ecore_Drm.h>
-#endif
 
 E_API int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE = -1;
 static Eina_Bool dont_set_ecore_drm_keymap = EINA_FALSE;
@@ -823,10 +821,8 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay
         return;
      }
 
-#ifdef HAVE_WL_DRM
    if (e_config->xkb.use_cache && !dont_set_ecore_drm_keymap)
      ecore_drm_device_keyboard_cached_context_set(e_comp_wl->xkb.context);
-#endif
 
    /* assemble xkb_rule_names so we can fetch keymap */
    memset(&names, 0, sizeof(names));
@@ -879,10 +875,8 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay
    /* update compositor keymap */
    _e_comp_wl_input_keymap_update(keymap, keymap_path);
 
-#ifdef HAVE_WL_DRM
    if (e_config->xkb.use_cache && !dont_set_ecore_drm_keymap)
      ecore_drm_device_keyboard_cached_keymap_set(keymap);
-#endif
 
    /* cleanup */
    if (keymap_path) eina_stringshare_del(keymap_path);
index fde3535f14896fffc8d4487bc06458f518082265..1a21986a32d6ebfbdebe16f33932cf502872bfdf 100644 (file)
@@ -1,12 +1,9 @@
 #include "e.h"
-#ifdef HAVE_WL_DRM
 #include <Ecore_Drm.h>
-#endif
 
 E_API int
 e_mouse_update(void)
 {
-#ifdef HAVE_WL_DRM
    if (strstr(ecore_evas_engine_name_get(e_comp->ee), "drm"))
      {
         const Eina_List *list, *l;
@@ -18,6 +15,5 @@ e_mouse_update(void)
              ecore_drm_device_pointer_left_handed_set(dev, (Eina_Bool)!e_config->mouse_hand);
           }
      }
-#endif
    return 1;
 }