From 0018f2093fe99a45473a24e464448756bcd755da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 18 Apr 2021 08:21:23 +0200 Subject: [PATCH] fix modules/ecore_evas/engines/wayland compilation broken after introduction of EMODAPI by a33138 Differential Revision: https://phab.enlightenment.org/D1222 --- .../engines/wayland/ecore_evas_wayland_egl.c | 18 ------------------ .../wayland/ecore_evas_wayland_private.h | 18 ++++++++++++++++++ .../engines/wayland/ecore_evas_wayland_shm.c | 18 ------------------ 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 5e08c33a7b..e98303c819 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -5,24 +5,6 @@ # include # include -#ifdef _WIN32 -# ifndef EFL_MODULE_STATIC -# define EMODAPI __declspec(dllexport) -# else -# define EMODAPI -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EMODAPI __attribute__ ((visibility("default"))) -# endif -# endif -#endif /* ! _WIN32 */ - -#ifndef EMODAPI -# define EMODAPI -#endif - /* external functions */ EMODAPI Ecore_Evas * ecore_evas_wayland_egl_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame, const int *opt) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h index 8213dc2b32..42e6a6baed 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h @@ -32,6 +32,24 @@ # include "ecore_evas_private.h" # include "ecore_evas_wayland.h" +#ifdef _WIN32 +# ifndef EFL_MODULE_STATIC +# define EMODAPI __declspec(dllexport) +# else +# define EMODAPI +# endif +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EMODAPI __attribute__ ((visibility("default"))) +# endif +# endif +#endif /* ! _WIN32 */ + +#ifndef EMODAPI +# define EMODAPI +#endif + typedef struct _Ecore_Evas_Engine_Wl_Data Ecore_Evas_Engine_Wl_Data; typedef struct _Ecore_Evas_Wl_Selection_Data Ecore_Evas_Wl_Selection_Data; diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index 6db7403cc0..74db8e8e69 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -5,24 +5,6 @@ # include # include -#ifdef _WIN32 -# ifndef EFL_MODULE_STATIC -# define EMODAPI __declspec(dllexport) -# else -# define EMODAPI -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EMODAPI __attribute__ ((visibility("default"))) -# endif -# endif -#endif /* ! _WIN32 */ - -#ifndef EMODAPI -# define EMODAPI -#endif - /* external functions */ EMODAPI Ecore_Evas * ecore_evas_wayland_shm_new_internal(const char *disp_name, Ecore_Window parent, int x, int y, int w, int h, Eina_Bool frame)