From 05947dd0b279b14ebf09aa5b78981bd73bc9fceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 18 Dec 2013 22:02:59 -0500 Subject: [PATCH] libfreerdp-core: fix linux build --- libfreerdp/core/tcp.h | 1 + winpr/libwinpr/synch/wait.c | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libfreerdp/core/tcp.h b/libfreerdp/core/tcp.h index 3ae94da34..b43fbaf1c 100644 --- a/libfreerdp/core/tcp.h +++ b/libfreerdp/core/tcp.h @@ -29,6 +29,7 @@ #include #include #include +#include #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 diff --git a/winpr/libwinpr/synch/wait.c b/winpr/libwinpr/synch/wait.c index 6bfd2e23a..017d59353 100644 --- a/winpr/libwinpr/synch/wait.c +++ b/winpr/libwinpr/synch/wait.c @@ -370,11 +370,11 @@ DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) if (status != 1) return WAIT_TIMEOUT; - length = read(timer->fd, (void*) &expirations, sizeof(UINT64)); + status = read(timer->fd, (void*) &expirations, sizeof(UINT64)); - if (length != 8) + if (status != 8) { - if (length == -1) + if (status == -1) { if (errno == ETIMEDOUT) return WAIT_TIMEOUT; @@ -416,7 +416,6 @@ DWORD WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds) return WAIT_FAILED; } - FD_ZERO(&rfds); FD_SET(fd, &rfds); ZeroMemory(&timeout, sizeof(timeout));