diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-12-17 15:07:37 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2017-12-17 15:07:37 +0900 |
| commit | 4abe5d90e47dfbb8faf1ba0e95ba3aeb20647394 (patch) | |
| tree | c93f118596f11a744fc3f2f8df72d047148ba89c | |
| parent | 90d0f695b4a4b7b504ea8f667a94df06ba672ec4 (diff) | |
| download | efl-4abe5d90e47dfbb8faf1ba0e95ba3aeb20647394.tar.gz | |
ecore main - try fix windows build
i hope this fixes T6517
| -rw-r--r-- | src/lib/ecore/ecore_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index ed115abff9..34281ef39d 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -1389,7 +1389,6 @@ _ecore_main_win32_handler_add(Eo *obj, Ecore_Win32_Handle_Cb func, const void *data) { - Efl_Loop_Data *pd = ML_DAT; Ecore_Win32_Handler *wh; EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); @@ -1400,6 +1399,7 @@ _ecore_main_win32_handler_add(Eo *obj, ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER); wh->loop = obj; wh->loop_data = pd; + wh->handler = handler; wh->h = (HANDLE)h; wh->func = func; wh->data = (void *)data; @@ -1410,7 +1410,9 @@ _ecore_main_win32_handler_add(Eo *obj, } void * -_ecore_main_win32_handler_del(Eo *obj, Efl_Loop_Data *pd, Ecore_Win32_Handler *win32_handler) +_ecore_main_win32_handler_del(Eo *obj EINA_UNUSED, + Efl_Loop_Data *pd, + Ecore_Win32_Handler *win32_handler) { if (win32_handler->delete_me) { @@ -1431,8 +1433,7 @@ ecore_main_win32_handler_add(void *h, const void *data) { EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); - return _ecore_main_win32_handler_add(efl_loop_main_get(EFL_LOOP_CLASS), - ML_DAT, NULL, func, data); + return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data); } EAPI void * @@ -2458,7 +2459,7 @@ _ecore_main_win32_objects_wait(DWORD objects_nbr, { Ecore_Main_Win32_Thread_Data *threads_data; HANDLE *threads_handles; - DWORD threads_nbr threads_remain, objects_idx, result, i; + DWORD threads_nbr, threads_remain, objects_idx, result, i; if (objects_nbr < MAXIMUM_WAIT_OBJECTS) return MsgWaitForMultipleObjects(objects_nbr, @@ -2584,7 +2585,6 @@ _ecore_main_win32_select(int nfds EINA_UNUSED, fd_set *exceptfds, struct timeval *tv) { - Eo *obj = ML_OBJ; Efl_Loop_Data *pd = ML_DAT; HANDLE *objects; int *sockets; |