From: Heeyong Song <heeyong.song@samsung.com>
Date: Thu, 10 May 2018 05:05:22 +0000 (+0900)
Subject: Revert "[Tizen] ecore-wl2: add zxdg_shell define"
X-Git-Tag: accepted/tizen/unified/20180514.094031~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7e272879bd32f8d1e4ff037f79c66f89127cdbd;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[Tizen] ecore-wl2: add zxdg_shell define"

This reverts commit d838dd854f0fca43170013f32d5bf5e4d9780b50.

Change-Id: I8fe9f3f32538beec2a0e5edf32d81f52c7eba73a
---

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