diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
commit | 0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c (patch) | |
tree | e941d8cac470415eab1469160234f7ec7dd217a9 /xlib/xutil.c | |
parent | fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6 (diff) | |
parent | e35d614587b25a1a03ededdf2d04bcbfca86be70 (diff) | |
download | tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.zip tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.gz tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.bz2 |
merge core-8-4-branchbug_3508771
Diffstat (limited to 'xlib/xutil.c')
-rw-r--r-- | xlib/xutil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlib/xutil.c b/xlib/xutil.c index db9d35e..23b589c 100644 --- a/xlib/xutil.c +++ b/xlib/xutil.c @@ -1,4 +1,4 @@ -/* +/* * xutil.c -- * * This function contains generic X emulation routines. @@ -46,7 +46,7 @@ XInternAtom(display, atom_name, only_if_exists) Bool only_if_exists; { static Atom atom = XA_LAST_PREDEFINED; - + display->request++; return ++atom; } @@ -85,7 +85,7 @@ XGetVisualInfo(display, vinfo_mask, vinfo_template, nitems_return) info->red_mask = info->visual->red_mask; info->green_mask = info->visual->green_mask; info->blue_mask = info->visual->blue_mask; - + if (((vinfo_mask & VisualIDMask) && (vinfo_template->visualid != info->visualid)) || ((vinfo_mask & VisualScreenMask) |