[Tizen] ecore-wl2: add zxdg_shell define

This reverts commit a9ccaff70bb1e7a8704f8ffabeb1fb6670da55f4.

Change-Id: Idd2b89af425e0e26857a08e2dbf8e9ac579f9fa4

diff --git a/dali/integration-api/wayland/wl-types.h b/dali/integration-api/wayland/wl-types.h
index d01b31d..4d1feb0 100644 (file)
--- a/dali/integration-api/wayland/wl-types.h
+++ b/dali/integration-api/wayland/wl-types.h
@@ -22,7 +22,11 @@
 #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
 
@@ -50,8 +54,14 @@ 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