summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xlib/X11/X.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index afdc20e..56deaff 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -126,6 +126,8 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs
#ifndef _WIN32
# define None 0L /* See bug [9e31fd9449] and below */
+#else
+# define None None /* uses the enum below */
#endif
#define ParentRelative 1L /* background pixmap in CreateWindow
@@ -234,6 +236,8 @@ are reserved in the protocol for errors and replies. */
#define LockMask (1<<1)
#ifndef _WIN32
# define ControlMask (1<<2) /* See bug [9e31fd9449] and below */
+#else
+# define ControlMask ControlMask /* uses the enum below */
#endif
#define Mod1Mask (1<<3)
#define Mod2Mask (1<<4)