[EGIT] [core/efl] master 01/06: ecore_drm2: Fix warning with a dirty hack

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4e41f7569bfb1ca2fa5591e96ea31df5af6fa6ad

commit 4e41f7569bfb1ca2fa5591e96ea31df5af6fa6ad
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Wed Aug 30 12:10:33 2017 -0500

    ecore_drm2: Fix warning with a dirty hack
    
    So because we include wayland-server.h we're told that wl_buffer is
    deprecated - however clients are still expected to use it, it's only
    deprecated for usage in a compositor.
    
    Making these into void pointers shuts up the warning.
    
    We need to include wayland-server.h since some of the code provided by
    ecore_wl2 is for compositors, but some of it is also for clients...
---
 src/lib/ecore_wl2/Ecore_Wl2.h         | 2 +-
 src/lib/ecore_wl2/ecore_wl2_private.h | 2 +-
 src/lib/ecore_wl2/ecore_wl2_window.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index e09c42e9ce..069ec152b8 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -1941,7 +1941,7 @@ EAPI void 
ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle)
  *
  * @since 1.20
  */
-EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, struct 
wl_buffer *buffer, int x, int y, Eina_Bool implicit);
+EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, 
int x, int y, Eina_Bool implicit);
 
 # endif
 
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h 
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 85661ecba3..9ee07b7463 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -162,7 +162,7 @@ struct _Ecore_Wl2_Window
    const char *role;
 
    struct wl_surface *surface;
-   struct wl_buffer *buffer;
+   void *buffer;
    struct wl_callback *callback;
    struct www_surface *www_surface;
    struct zxdg_surface_v6 *zxdg_surface;
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c 
b/src/lib/ecore_wl2/ecore_wl2_window.c
index 566ea99de7..2ea2bd979d 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1438,7 +1438,7 @@ 
ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle)
 }
 
 EAPI void
-ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, struct wl_buffer 
*buffer, int x, int y, Eina_Bool implicit)
+ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int 
y, Eina_Bool implicit)
 {
    EINA_SAFETY_ON_NULL_RETURN(win);
    EINA_SAFETY_ON_NULL_RETURN(win->surface);

--