diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 08:02:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-12-20 08:02:30 (GMT) |
| commit | 81b0bd7641a9d2f63154c97d41c27bbb696ef674 (patch) | |
| tree | a17119411589e8c1291df53e2546243d84e78583 /xlib/X11 | |
| parent | 93d974c265533cf2445446954346be8192e850a0 (diff) | |
| download | tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.zip tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.gz tk-81b0bd7641a9d2f63154c97d41c27bbb696ef674.tar.bz2 | |
Fix [9e31fd944934e269121fa78ff56b7b86f33e6db6|9e31fd9449]: X11/X.h and Windows.h have conflicting symbols.
Also fix a few newer (harmless) gcc warnings.
Diffstat (limited to 'xlib/X11')
| -rw-r--r-- | xlib/X11/X.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index daf2283..ad8f630 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -73,7 +73,9 @@ typedef unsigned long KeyCode; /* In order to use IME, the Macintosh needs * RESERVED RESOURCE AND CONSTANT DEFINITIONS *****************************************************************/ -#define None 0L /* universal null resource or null atom */ +#ifndef _WIN32 /* prevent conflicting define against windows.h, bug [9e31fd9449] */ +# define None 0L /* universal null resource or null atom */ +#endif #define ParentRelative 1L /* background pixmap in CreateWindow and ChangeWindowAttributes */ @@ -179,7 +181,9 @@ are reserved in the protocol for errors and replies. */ #define ShiftMask (1<<0) #define LockMask (1<<1) -#define ControlMask (1<<2) +#ifndef _WIN32 /* prevent conflicting define against windows.h, bug [9e31fd9449] */ +# define ControlMask (1<<2) +#endif #define Mod1Mask (1<<3) #define Mod2Mask (1<<4) #define Mod3Mask (1<<5) @@ -294,7 +298,7 @@ are reserved in the protocol for errors and replies. */ /* Used in SetInputFocus, GetInputFocus */ -#define RevertToNone (int)None +#define RevertToNone 0 #define RevertToPointerRoot (int)PointerRoot #define RevertToParent 2 |