xserver: Branch 'master' - 6 commits

[Keith Packard]

 hw/xnest/Keyboard.c              |    4 ++++
 hw/xwin/winclipboard/Makefile.am |    2 +-
 os/utils.c                       |    4 +++-
 os/xdmcp.c                       |    4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b
Merge: 28ff661 c7b49bd
Author: Keith Packard <keithp at keithp.com>
Date:   Mon May 11 15:36:53 2015 -0700

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

commit c7b49bdbb9321fe9a7dc35f47b91cac85516988f
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Mar 20 14:25:17 2015 +0000

    os/utils.c: Fix prototype for Win32TempDir()
    
    xorg/xserver/os/utils.c: In function ‘Win32TempDir’:
    xorg/xserver/os/utils.c:1643:1: warning: old-style function definition [-Wold-style-definition]
    
    Signed-off-by: Colin Harrison <colin.harrison at virgin.net>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/os/utils.c b/os/utils.c
index 74d73b3..6116697 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1640,7 +1640,7 @@ Fclose(void *iop)
 #include <X11/Xwindows.h>
 
 const char *
-Win32TempDir()
+Win32TempDir(void)
 {
     static char buffer[PATH_MAX];
 
commit a9b4b7b79682dd367ce26c29aa5dc85807201851
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Mar 20 14:25:53 2015 +0000

    os/utils.c: Don't try to build os_move_fd() for WIN32
    
    Signed-off-by: Colin Harrison <colin.harrison at virgin.net>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/os/utils.c b/os/utils.c
index 75769f1..74d73b3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -2091,6 +2091,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
@@ -2114,3 +2115,4 @@ os_move_fd(int fd)
     close(fd);
     return newfd;
 }
+#endif
commit 2b114d6a516ee584ff89b96b12acf91799b6d677
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Fri Mar 20 14:29:58 2015 +0000

    hw/xnest: Fix build for MinGW
    
    Include the wrapped windows.h via X11/Xwindows.h before xcb_keysyms.h to avoid
    type clashes caused by the unwrapped windows.h that includes.
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Colin Harrison <colin.harrison at virgin.net>

diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index ee3f68e..ae8375e 100644
--- a/hw/xnest/Keyboard.c
+++ b/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>
commit 5bf3e5c8326fb81655827dbd4c527f1a2ba09511
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Mar 18 13:29:22 2015 +0000

    hw/xwin/winclipboard: Link xwinclip with -lpthread
    
    Link xwinclip with -lpthread to fix build for MinGW
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Reviewed-by: Colin Harrison <colin.harrison at virgin.net>

diff --git a/hw/xwin/winclipboard/Makefile.am b/hw/xwin/winclipboard/Makefile.am
index b1c95f4..a1079ae 100644
--- a/hw/xwin/winclipboard/Makefile.am
+++ b/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
commit 8363ef2764fe9c6877d1cb21d3ce7b6cf869f00d
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Mar 20 14:06:49 2015 +0000

    os/xdmcp.c: Include Xtrans.h when building for WIN32
    
    Xtrans.h must be included on WIN32 to prototype _XSERVTransWSAStartup()
    
    xserver/os/xdmcp.c: In function ‘get_addr_by_name’:
    xserver/os/xdmcp.c:1483:5: error: implicit declaration of function ‘_XSERVTransWSAStartup’ [-Werror=implicit-function-declaration]
    
    Signed-off-by: Colin Harrison <colin.harrison at virgin.net>
    Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/os/xdmcp.c b/os/xdmcp.c
index bc5a707..b265db3 100644
--- a/os/xdmcp.c
+++ b/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>