diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-10 12:20:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-10 12:20:59 (GMT) |
| commit | b1056b9bb5d490a1826fc1735aecd7d8c969fba2 (patch) | |
| tree | f9af4a1a40545168128737789641a301ecad4314 | |
| parent | 23f460dc20b8d9f3cbf388da42062bd30e2771ac (diff) | |
| download | tk-b1056b9bb5d490a1826fc1735aecd7d8c969fba2.zip tk-b1056b9bb5d490a1826fc1735aecd7d8c969fba2.tar.gz tk-b1056b9bb5d490a1826fc1735aecd7d8c969fba2.tar.bz2 | |
Fix [593eb0227c]: X.h: define ControlMask and None as macros, even on Win32
| -rw-r--r-- | xlib/X11/X.h | 4 |
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) |