devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3291d32bf970b64bbf530a29a1783eb63521510f
commit 3291d32bf970b64bbf530a29a1783eb63521510f Author: Chris Michael <[email protected]> Date: Wed Aug 13 10:34:28 2014 -0400 Revert "ecore-wayland: Add missing EINA_UNUSED for unused function paramater" This reverts commit 67766929ca56da08dfe28ff0f69930244d53d10c. Revert all the xdg_shell changes. Should not have been pushed due to new API function. --- src/lib/ecore_wayland/ecore_wl.c | 2 +- src/lib/ecore_wayland/ecore_wl_window.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index a641e2b..ae0d337 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -65,7 +65,7 @@ static const struct wl_callback_listener _ecore_wl_anim_listener = }; static void -xdg_shell_ping(void *data EINA_UNUSED, struct xdg_shell *shell, uint32_t serial) +xdg_shell_ping(void *data, struct xdg_shell *shell, uint32_t serial) { xdg_shell_pong(shell, serial); } diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index c9e0983..64df3f7 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -799,7 +799,7 @@ _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface *shell_surface } static void -_ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface EINA_UNUSED, int32_t width, int32_t height, struct wl_array *states, uint32_t serial) +_ecore_xdg_handle_surface_configure(void *data, struct xdg_surface *xdg_surface, int32_t width, int32_t height, struct wl_array *states, uint32_t serial) { Ecore_Wl_Window *win = data; uint32_t *p; @@ -856,7 +856,7 @@ _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface *shell_surfac } static void -_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup EINA_UNUSED, unsigned int serial EINA_UNUSED) +_ecore_xdg_handle_popup_done(void *data, struct xdg_popup *xdg_popup, unsigned int serial) { Ecore_Wl_Window *win; --
