summaryrefslogtreecommitdiffstats
path: root/libvncserver/websockets.c
diff options
context:
space:
mode:
authordscho <johannes.schindelin@gmx.de>2014-09-30 10:03:57 +0200
committerdscho <johannes.schindelin@gmx.de>2014-09-30 10:03:57 +0200
commitbf87073f7a971f30e41af2a140822c4774c01313 (patch)
tree947b84172cc4002a924e777b2b627ada1f5fdabb /libvncserver/websockets.c
parentfdf5f8876f5f4bd08aa3dc47268c1f4c4590c0bb (diff)
parentfd075263f91eb3816b2e4e8584172805559ff69f (diff)
downloadlibtdevnc-bf87073f7a971f30e41af2a140822c4774c01313.tar.gz
libtdevnc-bf87073f7a971f30e41af2a140822c4774c01313.zip
Merge pull request #33 from danielgindi/master
More MSVC adjustments, now focuses on the libvncserver
Diffstat (limited to 'libvncserver/websockets.c')
-rw-r--r--libvncserver/websockets.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvncserver/websockets.c b/libvncserver/websockets.c
index bd5d9d0..34f04d7 100644
--- a/libvncserver/websockets.c
+++ b/libvncserver/websockets.c
@@ -31,10 +31,13 @@
#endif
#include <rfb/rfb.h>
-#include <resolv.h> /* __b64_ntop */
/* errno */
#include <errno.h>
+#ifndef _MSC_VER
+#include <resolv.h> /* __b64_ntop */
+#endif
+
#ifdef LIBVNCSERVER_HAVE_ENDIAN_H
#include <endian.h>
#elif LIBVNCSERVER_HAVE_SYS_ENDIAN_H