From d641c7cf034558901f3706d451bbb436a09bd3ae Mon Sep 17 00:00:00 2001
From: "Seungho, Baek" <sbsh.baek@samsung.com>
Date: Mon, 16 Apr 2018 14:47:24 +0900
Subject: [PATCH] Revert "[Tizen] ecore-wl2: add zxdg_shell define"

This reverts commit e3ba92aa0d2b44158c265b881d7f592f2f481911.

Change-Id: I1dbf3e66e21df0610dcf8b66b88ff6d1d1578ceb
---
 dali/integration-api/wayland/wl-types.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dali/integration-api/wayland/wl-types.h b/dali/integration-api/wayland/wl-types.h
index 4d1feb0..d01b31d 100644
--- a/dali/integration-api/wayland/wl-types.h
+++ b/dali/integration-api/wayland/wl-types.h
@@ -22,11 +22,7 @@
 #include <wayland-client.h> // from wayland-devel package
 
 #ifdef WAYLAND_EXTENSIONS_SUPPORTED
-#ifdef ECORE_WL2
-#include <wayland-extension/xdg-shell-unstable-v6-client-protocol.h>
-#else
 #include <wayland-extension/xdg-shell-client-protocol.h>   // from wayland
-#endif
 #include <wayland-extension/text-client-protocol.h>
 #endif
 
@@ -54,14 +50,8 @@ typedef ::wl_touch_listener WlTouchListener;
 typedef ::wl_keyboard_listener WlKeyboardListener;
 
 #ifdef WAYLAND_EXTENSIONS_SUPPORTED
-#ifdef ECORE_WL2
-typedef ::zxdg_shell_v6 WlXdgShell;
-typedef ::zxdg_surface_v6 WlXdgShellSurface;
-#else
 typedef ::xdg_shell WlXdgShell;
 typedef ::xdg_surface WlXdgShellSurface;
-#endif
-
 typedef ::wl_text_input_manager WlTextInputManager;   // See Tizen wayland-extensions/protocol/text.xml
 typedef ::wl_text_input WlTextInput;                  // See Tizen wayland-extensions/protocol/text.xml
 typedef ::wl_text_input_listener WlTextInputListener; // See Tizen wayland-extensions/protocol/text.xml
-- 
2.7.4