summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac1
-rw-r--r--libvncclient/sockets.c2
-rw-r--r--libvncserver/rfbserver.c4
4 files changed, 4 insertions, 5 deletions
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 f1c7c94..cab0018 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
OpenPOWER on IntegriCloud