summaryrefslogtreecommitdiff
path: root/hw/xwin/winwin32rootless.c
diff options
context:
space:
mode:
authorColin Harrison <colin.harrison@virgin.net>2008-12-17 17:16:02 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2008-12-18 12:37:15 +0000
commitb0ed1567c1782041cf3d14ec6dd4d622915c7d0c (patch)
tree35c5f1be082339f8c8c404a04b7dce4bf17b32fb /hw/xwin/winwin32rootless.c
parent15c4a6e088039e14b4f2387ff204cb5448916b39 (diff)
Xming, Cygwin/X: Tidy up warnings, headers and unused variables (#11132)
Tidy up various warnings, include headers and unused variables, etc. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winwin32rootless.c')
-rwxr-xr-xhw/xwin/winwin32rootless.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index 6f4e2c97e..406d1e0eb 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -38,7 +38,7 @@
#include "win.h"
#include <winuser.h>
#define _WINDOWSWM_SERVER_
-#include "windowswmstr.h"
+#include <X11/extensions/windowswmstr.h>
#include "dixevents.h"
#include "winmultiwindowclass.h"
#include "winprefs.h"
@@ -51,9 +51,15 @@
#define MOUSE_POLLING_INTERVAL 500
+#ifndef ULW_COLORKEY
#define ULW_COLORKEY 0x00000001
+#endif
+#ifndef ULW_ALPHA
#define ULW_ALPHA 0x00000002
+#endif
+#ifndef ULW_OPAQUE
#define ULW_OPAQUE 0x00000004
+#endif
#define AC_SRC_ALPHA 0x01
/*