From 3e78c992426423120a0994f3014584e2b2439977 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Mon, 19 Oct 2020 17:27:55 -0300 Subject: [PATCH] ecore_imf_evas: Rename EAPI macro to ECORE_IMF_EVAS_API in Ecore IMF Evas library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch from a series of patches to rename EAPI symbols to specific library DSOs. EAPI was designed to be able to pass ```__attribute__ ((visibility ("default")))``` for symbols with GCC, which would mean that even if -fvisibility=hidden was used when compiling the library, the needed symbols would get exported. MSVC __almost__ works like GCC (or mingw) in which you can declare everything as export and it will just work (slower, but it will work). But there's a caveat: global variables will not work the same way for MSVC, but works for mingw and GCC. For global variables (as opposed to functions), MSVC requires correct DSO visibility for MSVC: instead of declaring a symbol as export for everything, you need to declare it as import when importing from another DSO and export when defining it locally. With current EAPI definitions, we get the following example working in mingw and MSVC (observe it doesn't define any global variables as exported symbols). Example 1: dll1: ``` EAPI void foo(void); EAPI void bar() { foo(); } ``` dll2: ``` EAPI void foo() { printf ("foo\n"); } ``` This works fine with API defined as __declspec(dllexport) in both cases and for gcc defining as ```__atttribute__((visibility("default")))```. However, the following: Example 2: dll1: ``` EAPI extern int foo; EAPI void foobar(void); EAPI void bar() { foo = 5; foobar(); } ``` dll2: ``` EAPI int foo = 0; EAPI void foobar() { printf ("foo %d\n", foo); } ``` This will work on mingw but will not work for MSVC. And that's why EAPI is the only solution that worked for MSVC. Co-authored-by: João Paulo Taylor Ienczak Zanette Co-authored-by: Ricardo Campos Co-authored-by: Lucas Cavalcante de Sousa --- src/lib/ecore_imf_evas/Ecore_IMF_Evas.h | 35 +++++++++++-------------- src/lib/ecore_imf_evas/ecore_imf_evas.c | 16 +++++------ 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h index 87431fce9f..385f038616 100644 --- a/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h +++ b/src/lib/ecore_imf_evas/Ecore_IMF_Evas.h @@ -4,29 +4,29 @@ #include #include -#ifdef EAPI -# undef EAPI +#ifdef ECORE_IMF_EVAS_API +# undef ECORE_IMF_EVAS_API #endif #ifdef _WIN32 # ifdef EFL_BUILD # ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) +# define ECORE_IMF_EVAS_API __declspec(dllexport) # else -# define EAPI +# define ECORE_IMF_EVAS_API # endif # else -# define EAPI __declspec(dllimport) +# define ECORE_IMF_EVAS_API __declspec(dllimport) # endif #else # ifdef __GNUC__ # if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) +# define ECORE_IMF_EVAS_API __attribute__ ((visibility("default"))) # else -# define EAPI +# define ECORE_IMF_EVAS_API # endif # else -# define EAPI +# define ECORE_IMF_EVAS_API # endif #endif @@ -52,7 +52,7 @@ extern "C" { * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_in_wrap(Evas_Event_Mouse_In *evas_event, Ecore_IMF_Event_Mouse_In *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_in_wrap(Evas_Event_Mouse_In *evas_event, Ecore_IMF_Event_Mouse_In *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -61,7 +61,7 @@ EAPI void ecore_imf_evas_event_mouse_in_wrap(Evas_Event_Mouse_In *evas_event, Ec * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_out_wrap(Evas_Event_Mouse_Out *evas_event, Ecore_IMF_Event_Mouse_Out *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_out_wrap(Evas_Event_Mouse_Out *evas_event, Ecore_IMF_Event_Mouse_Out *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -70,7 +70,7 @@ EAPI void ecore_imf_evas_event_mouse_out_wrap(Evas_Event_Mouse_Out *evas_event, * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_move_wrap(Evas_Event_Mouse_Move *evas_event, Ecore_IMF_Event_Mouse_Move *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_move_wrap(Evas_Event_Mouse_Move *evas_event, Ecore_IMF_Event_Mouse_Move *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -79,7 +79,7 @@ EAPI void ecore_imf_evas_event_mouse_move_wrap(Evas_Event_Mouse_Move *evas_event * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_down_wrap(Evas_Event_Mouse_Down *evas_event, Ecore_IMF_Event_Mouse_Down *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_down_wrap(Evas_Event_Mouse_Down *evas_event, Ecore_IMF_Event_Mouse_Down *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -88,7 +88,7 @@ EAPI void ecore_imf_evas_event_mouse_down_wrap(Evas_Event_Mouse_Down *evas_event * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_up_wrap(Evas_Event_Mouse_Up *evas_event, Ecore_IMF_Event_Mouse_Up *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_up_wrap(Evas_Event_Mouse_Up *evas_event, Ecore_IMF_Event_Mouse_Up *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -97,7 +97,7 @@ EAPI void ecore_imf_evas_event_mouse_up_wrap(Evas_Event_Mouse_Up *evas_event, Ec * @param evas_event The received Evas event. * @param imf_event The location to store the converted Ecore_IMF event. */ -EAPI void ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_event, Ecore_IMF_Event_Mouse_Wheel *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_event, Ecore_IMF_Event_Mouse_Wheel *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -128,7 +128,7 @@ EAPI void ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_eve * evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _key_down_cb, data); * @endcode */ -EAPI void ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, Ecore_IMF_Event_Key_Down *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, Ecore_IMF_Event_Key_Down *imf_event); /** * @ingroup Ecore_IMF_Evas_Group @@ -159,13 +159,10 @@ EAPI void ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, Ec * evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_UP, _key_up_cb, data); * @endcode */ -EAPI void ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event, Ecore_IMF_Event_Key_Up *imf_event); +ECORE_IMF_EVAS_API void ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event, Ecore_IMF_Event_Key_Up *imf_event); #ifdef __cplusplus } #endif -#undef EAPI -#define EAPI - #endif diff --git a/src/lib/ecore_imf_evas/ecore_imf_evas.c b/src/lib/ecore_imf_evas/ecore_imf_evas.c index 1a53e56b9a..722c87ba75 100644 --- a/src/lib/ecore_imf_evas/ecore_imf_evas.c +++ b/src/lib/ecore_imf_evas/ecore_imf_evas.c @@ -62,7 +62,7 @@ _ecore_imf_evas_event_mouse_flags_wrap(Evas_Button_Flags evas_flags, *imf_flags |= ECORE_IMF_MOUSE_TRIPLE_CLICK; } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_in_wrap(Evas_Event_Mouse_In *evas_event, Ecore_IMF_Event_Mouse_In *imf_event) { @@ -79,7 +79,7 @@ ecore_imf_evas_event_mouse_in_wrap(Evas_Event_Mouse_In *evas_event, _ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_out_wrap(Evas_Event_Mouse_Out *evas_event, Ecore_IMF_Event_Mouse_Out *imf_event) { @@ -96,7 +96,7 @@ ecore_imf_evas_event_mouse_out_wrap(Evas_Event_Mouse_Out *evas_event, _ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_move_wrap(Evas_Event_Mouse_Move *evas_event, Ecore_IMF_Event_Mouse_Move *imf_event) { @@ -117,7 +117,7 @@ ecore_imf_evas_event_mouse_move_wrap(Evas_Event_Mouse_Move *evas_event, _ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_down_wrap(Evas_Event_Mouse_Down *evas_event, Ecore_IMF_Event_Mouse_Down *imf_event) { @@ -135,7 +135,7 @@ ecore_imf_evas_event_mouse_down_wrap(Evas_Event_Mouse_Down *evas_event, _ecore_imf_evas_event_mouse_flags_wrap(evas_event->flags, &imf_event->flags); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_up_wrap(Evas_Event_Mouse_Up *evas_event, Ecore_IMF_Event_Mouse_Up *imf_event) { @@ -153,7 +153,7 @@ ecore_imf_evas_event_mouse_up_wrap(Evas_Event_Mouse_Up *evas_event, _ecore_imf_evas_event_mouse_flags_wrap(evas_event->flags, &imf_event->flags); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_event, Ecore_IMF_Event_Mouse_Wheel *imf_event) { @@ -172,7 +172,7 @@ ecore_imf_evas_event_mouse_wheel_wrap(Evas_Event_Mouse_Wheel *evas_event, imf_event->timestamp = evas_event->timestamp; } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, Ecore_IMF_Event_Key_Down *imf_event) { @@ -203,7 +203,7 @@ ecore_imf_evas_event_key_down_wrap(Evas_Event_Key_Down *evas_event, _ecore_imf_evas_event_locks_wrap(evas_event->locks, &imf_event->locks); } -EAPI void +ECORE_IMF_EVAS_API void ecore_imf_evas_event_key_up_wrap(Evas_Event_Key_Up *evas_event, Ecore_IMF_Event_Key_Up *imf_event) {