diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-22 23:04:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-22 23:04:33 +0200 |
| commit | 1b58cdd160c2e0ada0f638679a2aa27e4665fc48 (patch) | |
| tree | 5a88e5a7aec9e04bc428c6a9e468cb2fc7ae2edb /src/gui_x11.c | |
| parent | 17f1347b867cbcc0ce380bf9a2466b4c31896f04 (diff) | |
| download | vim-git-1b58cdd160c2e0ada0f638679a2aa27e4665fc48.tar.gz | |
patch 7.4.2243v7.4.2243
Problem: Warning for assigning negative value to unsigned. (Danek Duvall)
Solution: Make cterm_normal_fg_gui_color and _bg_ guicolor_T, cast to long_u
only when an unsigned is needed.
Diffstat (limited to 'src/gui_x11.c')
| -rw-r--r-- | src/gui_x11.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c index 7f09880cd..2e3252d30 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -3095,7 +3095,7 @@ gui_x11_blink_cb( /* * Return the RGB value of a pixel as a long. */ - long_u + guicolor_T gui_mch_get_rgb(guicolor_T pixel) { XColor xc; @@ -3105,8 +3105,8 @@ gui_mch_get_rgb(guicolor_T pixel) xc.pixel = pixel; XQueryColor(gui.dpy, colormap, &xc); - return ((xc.red & 0xff00) << 8) + (xc.green & 0xff00) - + ((unsigned)xc.blue >> 8); + return (guicolor_T)(((xc.red & 0xff00) << 8) + (xc.green & 0xff00) + + ((unsigned)xc.blue >> 8)); } /* |