diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2023-11-10 13:30:18 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2023-11-10 13:30:18 (GMT) |
| commit | 84f2fa8523fe199ffa607bba122c3e08fa11a750 (patch) | |
| tree | 74840fe6bd2567cc9436e0ccec54eb7f5bb0bb20 | |
| parent | e7c9aef354dfd1a4a6d63f2abb6278f429b056ec (diff) | |
| parent | 56410ec6ae9289909c614df04aad9f58eed33013 (diff) | |
| download | tk-84f2fa8523fe199ffa607bba122c3e08fa11a750.zip tk-84f2fa8523fe199ffa607bba122c3e08fa11a750.tar.gz tk-84f2fa8523fe199ffa607bba122c3e08fa11a750.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | xlib/X11/X.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index 1eea61f..e6878d7 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -119,6 +119,7 @@ typedef unsigned int KeyCode; /* In order to use IME, the Macintosh needs * RESERVED RESOURCE AND CONSTANT DEFINITIONS *****************************************************************/ +/* Pert-Tk expects None to be a macro. See ticket [593eb0227c] */ #define None None /* See bug [9e31fd9449] and below */ #define ParentRelative 1L /* background pixmap in CreateWindow @@ -226,6 +227,7 @@ are reserved in the protocol for errors and replies. */ #define ShiftMask (1<<0) #define LockMask (1<<1) +/* Pert-Tk expects ControlMask to be a macro. See ticket [593eb0227c] */ #define ControlMask ControlMask /* See bug [9e31fd9449] and below */ #define Mod1Mask (1<<3) #define Mod2Mask (1<<4) |