diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 15:01:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 15:01:58 (GMT) |
| commit | c1d2b9d95856fe913236eec23533b0bd522726d3 (patch) | |
| tree | d2205c21c6895c4707b37d72ce3afbc98f0d3b4c /win/tkWinX.c | |
| parent | 93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (diff) | |
| download | tk-c1d2b9d95856fe913236eec23533b0bd522726d3.zip tk-c1d2b9d95856fe913236eec23533b0bd522726d3.tar.gz tk-c1d2b9d95856fe913236eec23533b0bd522726d3.tar.bz2 | |
Don't use "class" as (internal) struct field name or local variable name. Make it "c_class" (just as X11 does as well), in order to prevent conflict with C++ compilers.
Diffstat (limited to 'win/tkWinX.c')
| -rw-r--r-- | win/tkWinX.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tkWinX.c b/win/tkWinX.c index 58fe754..c01096e 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -501,30 +501,30 @@ TkWinDisplayChanged( screen->root_visual->visualid = 0; if (GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE) { screen->root_visual->map_entries = GetDeviceCaps(dc, SIZEPALETTE); - screen->root_visual->class = PseudoColor; + screen->root_visual->c_class = PseudoColor; screen->root_visual->red_mask = 0x0; screen->root_visual->green_mask = 0x0; screen->root_visual->blue_mask = 0x0; } else if (screen->root_depth == 4) { - screen->root_visual->class = StaticColor; + screen->root_visual->c_class = StaticColor; screen->root_visual->map_entries = 16; } else if (screen->root_depth == 8) { - screen->root_visual->class = StaticColor; + screen->root_visual->c_class = StaticColor; screen->root_visual->map_entries = 256; } else if (screen->root_depth == 12) { - screen->root_visual->class = TrueColor; + screen->root_visual->c_class = TrueColor; screen->root_visual->map_entries = 32; screen->root_visual->red_mask = 0xf0; screen->root_visual->green_mask = 0xf000; screen->root_visual->blue_mask = 0xf00000; } else if (screen->root_depth == 16) { - screen->root_visual->class = TrueColor; + screen->root_visual->c_class = TrueColor; screen->root_visual->map_entries = 64; screen->root_visual->red_mask = 0xf8; screen->root_visual->green_mask = 0xfc00; screen->root_visual->blue_mask = 0xf80000; } else if (screen->root_depth >= 24) { - screen->root_visual->class = TrueColor; + screen->root_visual->c_class = TrueColor; screen->root_visual->map_entries = 256; screen->root_visual->red_mask = 0xff; screen->root_visual->green_mask = 0xff00; |