summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wl2
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-08-30 12:10:33 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-08-30 14:11:47 -0500
commit4e41f7569bfb1ca2fa5591e96ea31df5af6fa6ad (patch)
tree291be9a79716746649afada17c561dd0fd5ccdf3 /src/lib/ecore_wl2
parent2b9a2692e8e2f3ed60fdf1e111ea5ffe1dfe0dcf (diff)
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...
Diffstat (limited to 'src/lib/ecore_wl2')
-rw-r--r--src/lib/ecore_wl2/Ecore_Wl2.h2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c2
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)
1941 * 1941 *
1942 * @since 1.20 1942 * @since 1.20
1943 */ 1943 */
1944EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, struct wl_buffer *buffer, int x, int y, Eina_Bool implicit); 1944EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y, Eina_Bool implicit);
1945 1945
1946# endif 1946# endif
1947 1947
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
162 const char *role; 162 const char *role;
163 163
164 struct wl_surface *surface; 164 struct wl_surface *surface;
165 struct wl_buffer *buffer; 165 void *buffer;
166 struct wl_callback *callback; 166 struct wl_callback *callback;
167 struct www_surface *www_surface; 167 struct www_surface *www_surface;
168 struct zxdg_surface_v6 *zxdg_surface; 168 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)
1438} 1438}
1439 1439
1440EAPI void 1440EAPI void
1441ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, struct wl_buffer *buffer, int x, int y, Eina_Bool implicit) 1441ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y, Eina_Bool implicit)
1442{ 1442{
1443 EINA_SAFETY_ON_NULL_RETURN(win); 1443 EINA_SAFETY_ON_NULL_RETURN(win);
1444 EINA_SAFETY_ON_NULL_RETURN(win->surface); 1444 EINA_SAFETY_ON_NULL_RETURN(win->surface);