raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e2d6691d524e15b0b0673d121e81c0544271617b
commit e2d6691d524e15b0b0673d121e81c0544271617b Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sun May 23 20:45:46 2021 +0100 fix warnings about redefinting EWAPI etc. due to windows EAPI changes --- src/lib/edje/Edje.h | 3 +++ src/lib/efl_canvas_wl/Efl_Canvas_Wl.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h index 44907ea29b..2a54f66a68 100644 --- a/src/lib/edje/Edje.h +++ b/src/lib/edje/Edje.h @@ -219,6 +219,9 @@ param in edje programs #ifdef EAPI # undef EAPI #endif +#ifdef EAPI_WEAK +# undef EAPI_WEAK +#endif #ifdef _WIN32 # ifdef EFL_BUILD diff --git a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h index b0c0772ab8..45d5627a47 100644 --- a/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h +++ b/src/lib/efl_canvas_wl/Efl_Canvas_Wl.h @@ -20,8 +20,6 @@ # endif # endif -#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; --
