From a7dae2523652c837464ee4c15582f774126e3af7 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 12 Mar 2015 14:23:22 -0400
Subject: [PATCH] Revert "e - fix build when wayland not enabled"

This reverts commit 413ca8046e44786d086816a94d60492b92f6fac6.

broke wayland runtime: wrong define names, wrong usage
---
 src/bin/e_win.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/bin/e_win.c b/src/bin/e_win.c
index f5a002d..5f75283 100644
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@@ -70,7 +70,6 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
         E_Pixmap_Type type = E_PIXMAP_TYPE_X;
 
         win = elm_win_window_id_get(o);
-#ifdef HAVE_WAYLAND_CLIENTS
         if (!strncmp(ecore_evas_engine_name_get(ee), "wayland", 7))
           {
              type = E_PIXMAP_TYPE_WL;
@@ -78,16 +77,12 @@ _e_elm_win_trap_show(void *data, Evas_Object *o)
              elm_win_borderless_set(o, 1);
              win = e_comp_wl_id_get(win, getpid());
           }
-#endif
-#ifndef HAVE_WAYLAND_ONLY
-# ifdef HAVE_WAYLAND_CLIENT
         else
-# endif
           {
              type = E_PIXMAP_TYPE_X;
              ctx->pointer = e_pointer_window_new(win, EINA_TRUE);
           }
-#endif
+
         ec = e_pixmap_find_client(type, win);
         if (ec)
           ctx->client = ec;
-- 
2.7.4