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 | |
| parent | 28ff661e73f4bdf0a9b7c84e70fa0a08fd30e482 (diff) | |
| parent | c7b49bdbb9321fe9a7dc35f47b91cac85516988f (diff) | |
Merge remote-tracking branch 'jturney/mingw-build-fixes'
| -rw-r--r-- | hw/xnest/Keyboard.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winclipboard/Makefile.am | 2 | ||||
| -rw-r--r-- | os/utils.c | 4 | ||||
| -rw-r--r-- | os/xdmcp.c | 4 |
4 files changed, 12 insertions, 2 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 002885f4f..7ee7a7c3c 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> diff --git a/hw/xwin/winclipboard/Makefile.am b/hw/xwin/winclipboard/Makefile.am index b1c95f4ef..a1079aec6 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 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> |