summaryrefslogtreecommitdiff
path: root/hw/xwin/winmultiwindowwm.c
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2008-11-02 18:27:09 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2008-12-16 16:28:01 +0000
commit6e85a8304b50c0bfd16a400a05d257f0168fb99b (patch)
tree5d0190c22f34113368d2c25d0494dbd01adb742e /hw/xwin/winmultiwindowwm.c
parent7aa29b9d66c3cd0f8af4fafbe92efd0c0556d225 (diff)
Cygwin/X: build machinery fixes
The Cygwin/X build has been broken for a long time, probably since modular X This patch fixes up configure/makefile and some general build issues (#18568) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winmultiwindowwm.c')
-rw-r--r--hw/xwin/winmultiwindowwm.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 5401ecdee..126ecc641 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -50,16 +50,7 @@
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
-
-/* Windows headers */
-#ifdef __CYGWIN__
-/* Fixups to prevent collisions between Windows and X headers */
-#define ATOM DWORD
-
-#include <windows.h>
-#else
-#include <Xwindows.h>
-#endif
+#include <X11/Xwindows.h>
/* Local headers */
#include "objbase.h"