From 8363ef2764fe9c6877d1cb21d3ce7b6cf869f00d Mon Sep 17 00:00:00 2001
From: Colin Harrison <colin.harrison@virgin.net>
Date: Fri, 20 Mar 2015 14:06:49 +0000
Subject: os/xdmcp.c: Include Xtrans.h when building for WIN32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
 os/xdmcp.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'os')

diff --git a/os/xdmcp.c b/os/xdmcp.c
index bc5a70706..b265db338 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>
-- 
cgit v1.2.3


From a9b4b7b79682dd367ce26c29aa5dc85807201851 Mon Sep 17 00:00:00 2001
From: Colin Harrison <colin.harrison@virgin.net>
Date: Fri, 20 Mar 2015 14:25:53 +0000
Subject: os/utils.c: Don't try to build os_move_fd() for WIN32

Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
 os/utils.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'os')

diff --git a/os/utils.c b/os/utils.c
index 75769f17c..74d73b305 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
-- 
cgit v1.2.3


From c7b49bdbb9321fe9a7dc35f47b91cac85516988f Mon Sep 17 00:00:00 2001
From: Colin Harrison <colin.harrison@virgin.net>
Date: Fri, 20 Mar 2015 14:25:17 +0000
Subject: os/utils.c: Fix prototype for Win32TempDir()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
 os/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'os')

diff --git a/os/utils.c b/os/utils.c
index 74d73b305..61166970c 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];
 
-- 
cgit v1.2.3