summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-17 15:07:37 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-12-17 15:07:37 +0900
commit4abe5d90e47dfbb8faf1ba0e95ba3aeb20647394 (patch)
treec93f118596f11a744fc3f2f8df72d047148ba89c
parent90d0f695b4a4b7b504ea8f667a94df06ba672ec4 (diff)
ecore main - try fix windows build
i hope this fixes T6517
-rw-r--r--src/lib/ecore/ecore_main.c12
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,
1389 Ecore_Win32_Handle_Cb func, 1389 Ecore_Win32_Handle_Cb func,
1390 const void *data) 1390 const void *data)
1391{ 1391{
1392 Efl_Loop_Data *pd = ML_DAT;
1393 Ecore_Win32_Handler *wh; 1392 Ecore_Win32_Handler *wh;
1394 1393
1395 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 1394 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
@@ -1400,6 +1399,7 @@ _ecore_main_win32_handler_add(Eo *obj,
1400 ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER); 1399 ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER);
1401 wh->loop = obj; 1400 wh->loop = obj;
1402 wh->loop_data = pd; 1401 wh->loop_data = pd;
1402 wh->handler = handler;
1403 wh->h = (HANDLE)h; 1403 wh->h = (HANDLE)h;
1404 wh->func = func; 1404 wh->func = func;
1405 wh->data = (void *)data; 1405 wh->data = (void *)data;
@@ -1410,7 +1410,9 @@ _ecore_main_win32_handler_add(Eo *obj,
1410} 1410}
1411 1411
1412void * 1412void *
1413_ecore_main_win32_handler_del(Eo *obj, Efl_Loop_Data *pd, Ecore_Win32_Handler *win32_handler) 1413_ecore_main_win32_handler_del(Eo *obj EINA_UNUSED,
1414 Efl_Loop_Data *pd,
1415 Ecore_Win32_Handler *win32_handler)
1414{ 1416{
1415 if (win32_handler->delete_me) 1417 if (win32_handler->delete_me)
1416 { 1418 {
@@ -1431,8 +1433,7 @@ ecore_main_win32_handler_add(void *h,
1431 const void *data) 1433 const void *data)
1432{ 1434{
1433 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); 1435 EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
1434 return _ecore_main_win32_handler_add(efl_loop_main_get(EFL_LOOP_CLASS), 1436 return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data);
1435 ML_DAT, NULL, func, data);
1436} 1437}
1437 1438
1438EAPI void * 1439EAPI void *
@@ -2458,7 +2459,7 @@ _ecore_main_win32_objects_wait(DWORD objects_nbr,
2458{ 2459{
2459 Ecore_Main_Win32_Thread_Data *threads_data; 2460 Ecore_Main_Win32_Thread_Data *threads_data;
2460 HANDLE *threads_handles; 2461 HANDLE *threads_handles;
2461 DWORD threads_nbr threads_remain, objects_idx, result, i; 2462 DWORD threads_nbr, threads_remain, objects_idx, result, i;
2462 2463
2463 if (objects_nbr < MAXIMUM_WAIT_OBJECTS) 2464 if (objects_nbr < MAXIMUM_WAIT_OBJECTS)
2464 return MsgWaitForMultipleObjects(objects_nbr, 2465 return MsgWaitForMultipleObjects(objects_nbr,
@@ -2584,7 +2585,6 @@ _ecore_main_win32_select(int nfds EINA_UNUSED,
2584 fd_set *exceptfds, 2585 fd_set *exceptfds,
2585 struct timeval *tv) 2586 struct timeval *tv)
2586{ 2587{
2587 Eo *obj = ML_OBJ;
2588 Efl_Loop_Data *pd = ML_DAT; 2588 Efl_Loop_Data *pd = ML_DAT;
2589 HANDLE *objects; 2589 HANDLE *objects;
2590 int *sockets; 2590 int *sockets;