diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-26 14:59:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-26 14:59:12 (GMT) |
| commit | ccc7f53ac59980eae109a3314ba3599a8b851fb1 (patch) | |
| tree | 463107a795438fdd55c228d1b20cd4499d48a231 /xlib | |
| parent | 36b48da5ca6c18d23f774188450f6f2bedbf1034 (diff) | |
| parent | b68e469c6fcec04a86935ae2e8853197213f40db (diff) | |
| download | tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.zip tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.tar.gz tk-ccc7f53ac59980eae109a3314ba3599a8b851fb1.tar.bz2 | |
Merge 8.5. Undo previous introduced ***POTENTIAL INCOMPATIBLITY*** on win32
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/X.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index ad8f630..316683b 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -73,9 +73,7 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs * RESERVED RESOURCE AND CONSTANT DEFINITIONS *****************************************************************/ -#ifndef _WIN32 /* prevent conflicting define against windows.h, bug [9e31fd9449] */ -# define None 0L /* universal null resource or null atom */ -#endif +/* define None 0L See bug [9e31fd9449] and below */ #define ParentRelative 1L /* background pixmap in CreateWindow and ChangeWindowAttributes */ @@ -181,15 +179,16 @@ are reserved in the protocol for errors and replies. */ #define ShiftMask (1<<0) #define LockMask (1<<1) -#ifndef _WIN32 /* prevent conflicting define against windows.h, bug [9e31fd9449] */ -# define ControlMask (1<<2) -#endif +/* define ControlMask (1<<2) See bug [9e31fd9449] and below */ #define Mod1Mask (1<<3) #define Mod2Mask (1<<4) #define Mod3Mask (1<<5) #define Mod4Mask (1<<6) #define Mod5Mask (1<<7) +/* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */ +enum _Bug9e31fd9449 { None = 0, ControlMask = (1<<2) }; + /* modifier names. Used to build a SetModifierMapping request or to read a GetModifierMapping request. These correspond to the masks defined above. */ |