diff options
| -rw-r--r-- | generic/tkBind.c | 2 | ||||
| -rw-r--r-- | generic/tkRectOval.c | 2 | ||||
| -rw-r--r-- | win/tkWinInt.h | 5 | ||||
| -rw-r--r-- | xlib/X11/X.h | 11 |
4 files changed, 7 insertions, 13 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 275e2e6..c67ddcc 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -596,7 +596,7 @@ static const TkStateMap visNotify[] = { }; static const TkStateMap configureRequestDetail[] = { - {0, "None"}, + {0, "None"}, {Above, "Above"}, {Below, "Below"}, {BottomIf, "BottomIf"}, diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index 01890e1..b6c24a9 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.c @@ -516,7 +516,7 @@ ConfigureRectOval( * fills (as linewidth controls antialiasing). */ - gcValues.line_width = rectOvalPtr->outline.gc != None ? + gcValues.line_width = rectOvalPtr->outline.gc ? rectOvalPtr->outline.gc->line_width : 0; mask |= GCLineWidth; #endif diff --git a/win/tkWinInt.h b/win/tkWinInt.h index 4029354..0e2c844 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.h @@ -37,11 +37,6 @@ #define SPI_SETKEYBOARDCUES 0x100B #endif -#if defined(_WIN32) && !defined(ControlMask) /* prevent conflicting define against windows.h, bug [9e31fd9449] */ -# define ControlMask (1<<2) -#endif - - /* * The TkWinDCState is used to save the state of a device context so that it * can be restored later. 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. */ |