Revert "[Tizen] ecore-wl2: add zxdg_shell define" 90/175190/1
authorhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 07:50:50 +0000 (16:50 +0900)
committerhuiyu.eun <huiyu.eun@samsung.com>
Mon, 9 Apr 2018 07:50:52 +0000 (16:50 +0900)
This reverts commit f664935354230973e1b9c6221638307d5fe45fa1.

Change-Id: I5f25e019e9391e5b541a4bfc637431836822f177
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
dali/integration-api/wayland/wl-types.h

index 4d1feb0..d01b31d 100644 (file)
 #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