raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ddfa2ef41c044589c1353d7f68702abf48ee82a3
commit ddfa2ef41c044589c1353d7f68702abf48ee82a3 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Nov 5 12:17:42 2020 +0000 Revert "eo_test_general.c: Make eo_signals tests pass on Windows" This reverts commit fc949660f70f99fe97e63de65b1b67377d16c6da. --- src/tests/eo/suite/eo_test_general.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 7bdb0e170b..ae026a27f4 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -199,26 +199,11 @@ _eo_signals_cb_added_deled(void *data EINA_UNUSED, const Efl_Event *event) fail_if(callback_array->func != _eo_signals_cb_added_deled); } -// We don't use the EFL_CALLBACKS_ARRAY_DEFINE macro because -// we need the callbacks be called in a specific order -static Efl_Callback_Array_Item * -_eo_signals_callbacks(void) -{ - static Efl_Callback_Array_Item items[] = - { - { EV_A_CHANGED, _eo_signals_a_changed_cb }, - { EV_A_CHANGED, _eo_signals_a_changed_cb2 }, - { EV_A_CHANGED, _eo_signals_a_changed_never }, - { 0, _eo_signals_efl_del_cb }, - { 0, 0 }, - }; - - // On Windows, because _EFL_EVENT_DEL is a symbol exported - // from the DLL, we can't assign from a context expression - items[3].desc = EFL_EVENT_DEL; - - return items; -} +EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks, +{ EV_A_CHANGED, _eo_signals_a_changed_cb }, +{ EV_A_CHANGED, _eo_signals_a_changed_cb2 }, +{ EV_A_CHANGED, _eo_signals_a_changed_never }, +{ EFL_EVENT_DEL, _eo_signals_efl_del_cb }); EFL_START_TEST(eo_signals) { --
