summaryrefslogtreecommitdiffstats
path: root/libvncserver/sockets.c
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2018-11-07 20:30:25 +0100
committerGitHub <noreply@github.com>2018-11-07 20:30:25 +0100
commitf997b5a75fa171d79c5e568b7157fba83c8d8355 (patch)
tree8c858680355429a3b1df318124789e17083a53f6 /libvncserver/sockets.c
parent393e51884616f1e291779392ab33ee2bac338551 (diff)
parent9f5116eb538491c181bfd845efe9333ef5b5376d (diff)
downloadlibtdevnc-f997b5a75fa171d79c5e568b7157fba83c8d8355.tar.gz
libtdevnc-f997b5a75fa171d79c5e568b7157fba83c8d8355.zip
Merge pull request #261 from veyon/misc-fixes
Misc fixes
Diffstat (limited to 'libvncserver/sockets.c')
-rw-r--r--libvncserver/sockets.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
index bbc3d90..fe54a37 100644
--- a/libvncserver/sockets.c
+++ b/libvncserver/sockets.c
@@ -109,7 +109,13 @@ int deny_severity=LOG_WARNING;
#pragma warning (disable: 4018 4761)
#endif
#define read(sock,buf,len) recv(sock,buf,len,0)
+#ifdef EWOULDBLOCK
+#undef EWOULDBLOCK
+#endif
#define EWOULDBLOCK WSAEWOULDBLOCK
+#ifdef ETIMEDOUT
+#undef ETIMEDOUT
+#endif
#define ETIMEDOUT WSAETIMEDOUT
#define write(sock,buf,len) send(sock,buf,len,0)
#else