From: huiyu.eun <huiyu.eun@samsung.com>
Date: Mon, 9 Apr 2018 07:53:56 +0000 (+0900)
Subject: [Tizen] ecore-wl2: add zxdg_shell define
X-Git-Tag: accepted/tizen/unified/20180412.073721~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F175200%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[Tizen] ecore-wl2: add zxdg_shell define

This reverts commit 4aa591d9621b5f39e385a8c15b8cba57f6481693.

Change-Id: I566441e08688f50428f81bff08af2e9d487d9adf
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---

diff --git a/dali/integration-api/wayland/wl-types.h b/dali/integration-api/wayland/wl-types.h
index d01b31d..4d1feb0 100644
--- 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