summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rw-r--r--NEWS6
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac1
-rw-r--r--libvncclient/sockets.c2
-rw-r--r--libvncserver/rfbserver.c4
6 files changed, 12 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index c63772d..a91ccfa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,7 +38,8 @@ George Fleury, Kan-Ru Chen, Steve Guo, Luca Stauble, Peter Watkins,
Kyle J. McKay, Mateus Cesar Groess, Philip Van Hoof, D. R. Commander,
Rostislav Lisovy, Oliver Loch, Raphael Kubo da Costa, Amandeep Singh,
Brian Bidulock, Daniel Cohen Gindi, David Verbeiren, Luca Falavigna,
-Matthias Treydte, Nicolas Ruff and Robbert Klarenbeek.
+Matthias Treydte, Nicolas Ruff, Robbert Klarenbeek and Floris Bos.
+
Probably I forgot quite a few people sending a patch here and there, which
really made a difference. Without those, some obscure bugs still would
diff --git a/NEWS b/NEWS
index 218ecdb..6a838c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+0.9.11
+ - LibVNCClient:
+ * Now initializes libgcrypt before use if the application did not do it.
+ Fixes a crash when connection to Mac hosts
+ (https://github.com/LibVNC/libvncserver/issues/45).
+
0.9.10
- Overall changes:
* Moved the whole project from sourceforge to https://libvnc.github.io/.
diff --git a/autogen.sh b/autogen.sh
index 0776325..2437158 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
#!/bin/sh
autoreconf -fiv &&
-./configure
+./configure "$@"
diff --git a/configure.ac b/configure.ac
index fe8b1de..bcf5128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,7 +439,6 @@ MINGW=`echo $host_os | grep mingw32 2>/dev/null`
AM_CONDITIONAL(MINGW, test ! -z "$MINGW" )
if test ! -z "$MINGW"; then
WSOCKLIB="-lws2_32"
- LDFLAGS="$LDFLAGS -no-undefined"
fi
AC_SUBST(WSOCKLIB)
diff --git a/libvncclient/sockets.c b/libvncclient/sockets.c
index c09b555..e32c60e 100644
--- a/libvncclient/sockets.c
+++ b/libvncclient/sockets.c
@@ -38,9 +38,7 @@
#ifdef WIN32
#undef SOCKET
#include <winsock2.h>
-#ifdef MINGW32
#define EWOULDBLOCK WSAEWOULDBLOCK
-#endif
#define close closesocket
#define read(sock,buf,len) recv(sock,buf,len,0)
#define write(sock,buf,len) send(sock,buf,len,0)
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
index b2532e3..34e1c06 100644
--- a/libvncserver/rfbserver.c
+++ b/libvncserver/rfbserver.c
@@ -98,13 +98,15 @@
#endif
#ifdef WIN32
+#include <direct.h>
#ifdef __MINGW32__
#define mkdir(path, perms) mkdir(path) /* Omit the perms argument to match POSIX signature */
#else /* MSVC and other windows compilers */
#define mkdir(path, perms) _mkdir(path) /* Omit the perms argument to match POSIX signature */
#endif /* __MINGW32__ else... */
+#ifndef S_ISDIR
#define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR)
-#include <direct.h>
+#endif
#endif
#ifdef LIBVNCSERVER_HAVE_LIBJPEG