summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2015-03-20 14:29:58 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2015-04-22 12:55:27 +0100
commit2b114d6a516ee584ff89b96b12acf91799b6d677 (patch)
tree658ab8720d4311b3ed7fdff90e27afc712adbc9b /hw
parent5bf3e5c8326fb81655827dbd4c527f1a2ba09511 (diff)
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@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Diffstat (limited to 'hw')
-rw-r--r--hw/xnest/Keyboard.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index ee3f68e3f..ae8375ee3 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>