timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore main - try fix windows build 

i hope this fixes T6517
This commit is contained in:
Carsten Haitzler 2017-12-17 15:07:37 +09:00
parent 90d0f695b4
commit 4abe5d90e4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/ecore/ecore_main.c
View File

@ -1389,7 +1389,6 @@ _ecore_main_win32_handler_add(Eo *obj,
Ecore_Win32_Handle_Cb func, Ecore_Win32_Handle_Cb func,
const void *data) const void *data)
{ {
Efl_Loop_Data *pd = ML_DAT;
Ecore_Win32_Handler *wh; Ecore_Win32_Handler *wh;
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 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); ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER);
wh->loop = obj; wh->loop = obj;
wh->loop_data = pd; wh->loop_data = pd;
wh->handler = handler;
wh->h = (HANDLE)h; wh->h = (HANDLE)h;
wh->func = func; wh->func = func;
wh->data = (void *)data; wh->data = (void *)data;
@ -1410,7 +1410,9 @@ _ecore_main_win32_handler_add(Eo *obj,
} }
void * 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) if (win32_handler->delete_me)
{ {
@ -1431,8 +1433,7 @@ ecore_main_win32_handler_add(void *h,
const void *data) const void *data)
{ {
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
return _ecore_main_win32_handler_add(efl_loop_main_get(EFL_LOOP_CLASS), return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data);
ML_DAT, NULL, func, data);
} }
EAPI void * EAPI void *
@ -2458,7 +2459,7 @@ _ecore_main_win32_objects_wait(DWORD objects_nbr,
{ {
Ecore_Main_Win32_Thread_Data *threads_data; Ecore_Main_Win32_Thread_Data *threads_data;
HANDLE *threads_handles; 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) if (objects_nbr < MAXIMUM_WAIT_OBJECTS)
return MsgWaitForMultipleObjects(objects_nbr, return MsgWaitForMultipleObjects(objects_nbr,
@ -2584,7 +2585,6 @@ _ecore_main_win32_select(int nfds EINA_UNUSED,
fd_set *exceptfds, fd_set *exceptfds,
struct timeval *tv) struct timeval *tv)
{ {
Eo *obj = ML_OBJ;
Efl_Loop_Data *pd = ML_DAT; Efl_Loop_Data *pd = ML_DAT;
HANDLE *objects; HANDLE *objects;
int *sockets; int *sockets;