diff options
| author | Keith Packard <keithp@keithp.com> | 2015-05-11 15:36:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-05-11 15:36:53 -0700 |
| commit | 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b (patch) | |
| tree | 2271c7e309aa22729948c63950bb650db3f12a33 /os | |
| parent | 28ff661e73f4bdf0a9b7c84e70fa0a08fd30e482 (diff) | |
| parent | c7b49bdbb9321fe9a7dc35f47b91cac85516988f (diff) | |
Merge remote-tracking branch 'jturney/mingw-build-fixes'
Diffstat (limited to 'os')
| -rw-r--r-- | os/utils.c | 4 | ||||
| -rw-r--r-- | os/xdmcp.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/os/utils.c b/os/utils.c index aef52c4b7..7fd395b2a 100644 --- a/os/utils.c +++ b/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 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> |