summaryrefslogtreecommitdiffstats
path: root/xlib/xutil.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-24 15:01:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-24 15:01:58 (GMT)
commitc1d2b9d95856fe913236eec23533b0bd522726d3 (patch)
treed2205c21c6895c4707b37d72ce3afbc98f0d3b4c /xlib/xutil.c
parent93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (diff)
downloadtk-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 'xlib/xutil.c')
-rw-r--r--xlib/xutil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlib/xutil.c b/xlib/xutil.c
index 1e81549..d80b742 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -70,7 +70,7 @@ XGetVisualInfo(
info->visualid = info->visual->visualid;
info->screen = 0;
info->depth = info->visual->bits_per_rgb;
- info->class = info->visual->class;
+ info->c_class = info->visual->c_class;
info->colormap_size = info->visual->map_entries;
info->bits_per_rgb = info->visual->bits_per_rgb;
info->red_mask = info->visual->red_mask;
@@ -84,7 +84,7 @@ XGetVisualInfo(
|| ((vinfo_mask & VisualDepthMask)
&& (vinfo_template->depth != info->depth))
|| ((vinfo_mask & VisualClassMask)
- && (vinfo_template->class != info->class))
+ && (vinfo_template->c_class != info->c_class))
|| ((vinfo_mask & VisualColormapSizeMask)
&& (vinfo_template->colormap_size != info->colormap_size))
|| ((vinfo_mask & VisualBitsPerRGBMask)