mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-utils: fix wait_obj_select for Windows.

Browse Source
This commit is contained in:
Vic Lee 2012-08-12 13:41:38 +08:00
parent 89844c4e10
commit d5930f8d99
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libfreerdp-utils/wait_obj.c
View File

@ -171,13 +171,12 @@ wait_obj_clear(struct wait_obj* obj)
int
wait_obj_select(struct wait_obj** listobj, int numobj, int timeout)
{
int index;
int status;
#ifndef _WIN32
int max;
int sock;
int index;
#endif
fd_set fds;
int status;
struct timeval time;
struct timeval* ptime;
@ -189,7 +188,6 @@ wait_obj_select(struct wait_obj** listobj, int numobj, int timeout)
ptime = &time;
}
#ifndef _WIN32
max = 0;
FD_ZERO(&fds);
if (listobj)
@ -205,7 +203,18 @@ wait_obj_select(struct wait_obj** listobj, int numobj, int timeout)
}
status = select(max + 1, &fds, 0, 0, ptime);
#else
status = select(0, &fds, 0, 0, ptime);
HANDLE *hnds;
hnds = (HANDLE *) xzalloc(sizeof(HANDLE) * (numobj + 1));
for (index = 0; index < numobj; index++)
{
hnds[index] = listobj[index]->event;
}
if (WaitForMultipleObjects(numobj, hnds, FALSE, timeout) == WAIT_FAILED)
status = -1;
else
status = 0;
#endif
return status;