Merge remote-tracking branch 'jturney/mingw-build-fixes'

hw/xnest/Keyboard.c

@@ -16,6 +16,10 @@ is" without express or implied warranty.
 #include <xnest-config.h>
 #endif
 
+#ifdef WIN32
+#include <X11/Xwindows.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <xcb/xcb_keysyms.h>

hw/xwin/winclipboard/Makefile.am

@@ -19,7 +19,7 @@ xwinclip_SOURCES = xwinclip.c debug.c
 
 xwinclip_CFLAGS = $(XWINMODULES_CFLAGS)
 
-xwinclip_LDADD = libXWinclipboard.la $(XWINMODULES_LIBS) -lgdi32
+xwinclip_LDADD = libXWinclipboard.la $(XWINMODULES_LIBS) -lgdi32 -lpthread
 
 include $(top_srcdir)/manpages.am
 appman_PRE = xwinclip.man

os/utils.c

@@ -1660,7 +1660,7 @@ Fclose(void *iop)
 #include <X11/Xwindows.h>
 
 const char *
-Win32TempDir()
+Win32TempDir(void)
 {
     static char buffer[PATH_MAX];
 
@@ -2111,6 +2111,7 @@ FormatUInt64Hex(uint64_t num, char *string)
     string[len] = '\0';
 }
 
+#if !defined(WIN32) || defined(__CYGWIN__)
 /* Move a file descriptor out of the way of our select mask; this
  * is useful for file descriptors which will never appear in the
  * select mask to avoid reducing the number of clients that can
@@ -2134,3 +2135,4 @@ os_move_fd(int fd)
     close(fd);
     return newfd;
 }
+#endif

os/xdmcp.c

@@ -19,6 +19,10 @@
 
 #ifdef WIN32
 #include <X11/Xwinsock.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include <X11/Xtrans/Xtrans.h>
 #endif
 
 #include <X11/Xos.h>