diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2015-03-20 14:29:58 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-06-03 09:05:37 -0400 |
| commit | cc88bb64adda0e967c5ea0efa34aca015fa9c346 (patch) | |
| tree | d075a337c4c0299d298bb08459802b1e0f6d74a6 /hw | |
| parent | 36bba39db1d4b5b47bc7db5724a4370a4bcb1ecd (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>
(cherry picked from commit 2b114d6a516ee584ff89b96b12acf91799b6d677)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xnest/Keyboard.c | 4 |
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> |