From 1c404d188189039064d6f29f75076b2931ac9793 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 11 Jun 2017 13:06:46 -0700 Subject: [PATCH] GUACAMOLE-325: Use recv() on Windows platforms. --- src/libguac/socket-fd.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libguac/socket-fd.c b/src/libguac/socket-fd.c index f806b87b..b12173df 100644 --- a/src/libguac/socket-fd.c +++ b/src/libguac/socket-fd.c @@ -146,8 +146,15 @@ static ssize_t guac_socket_fd_read_handler(guac_socket* socket, guac_socket_fd_data* data = (guac_socket_fd_data*) socket->data; - /* Read from socket */ - int retval = read(data->fd, buf, count); + int retval; + +#ifdef __MINGW32__ + /* MINGW32 WINSOCK only works with recv() */ + retval = recv(data->fd, buf, count, 0); +#else + /* Use read() for all other platforms */ + retval = read(data->fd, buf, count); +#endif /* Record errors in guac_error */ if (retval < 0) {