zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=592ca5ea3b4622e971145fb9558f8d5c24f44f67
commit 592ca5ea3b4622e971145fb9558f8d5c24f44f67 Author: Mike Blumenkrantz <[email protected]> Date: Thu Mar 12 12:16:31 2020 -0400 efl/wl: define opaque wl/xkb types to native types when those headers are included Summary: simplify a lot of casting when we're in a native wl env Depends on D11495 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11496 --- src/lib/efl_canvas_wl/Efl_Canvas_Wl.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h index b62f0de729..0fae48a3a9 100644 --- a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h +++ b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h @@ -22,15 +22,26 @@ #define EWAPI EAPI EAPI_WEAK - +#ifdef WAYLAND_UTIL_H +typedef struct wl_surface Efl_Canvas_Wl_Wl_Surface; +typedef struct wl_global Efl_Canvas_Wl_Wl_Global; +typedef struct wl_interface Efl_Canvas_Wl_Wl_Interface; +typedef struct wl_array Efl_Canvas_Wl_Wl_Array; +typedef void Efl_Canvas_Wl_Wl_Interface_Data; +typedef void Efl_Canvas_Wl_Wl_Interface_Bind_Cb; +#else typedef struct Efl_Canvas_Wl_Wl_Surface Efl_Canvas_Wl_Wl_Surface; typedef struct Efl_Canvas_Wl_Wl_Global Efl_Canvas_Wl_Wl_Global; typedef struct Efl_Canvas_Wl_Wl_Interface Efl_Canvas_Wl_Wl_Interface; typedef struct Efl_Canvas_Wl_Wl_Array Efl_Canvas_Wl_Wl_Array; typedef void * Efl_Canvas_Wl_Wl_Interface_Data; typedef void * Efl_Canvas_Wl_Wl_Interface_Bind_Cb; +#endif +#ifdef _XKBCOMMON_H_ +typedef struct xkb_state Efl_Canvas_Wl_Xkb_State; +#else typedef struct Efl_Canvas_Wl_Xkb_State Efl_Canvas_Wl_Xkb_State; - +#endif #include <efl_canvas_wl_surface.eo.h> #include <efl_canvas_wl.eo.h> /** --
