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_gtk_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_gtk_x11.c')
| -rw-r--r-- | src/gui_gtk_x11.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index ee73db339..added7bd2 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -7020,7 +7020,7 @@ gui_mch_enable_scrollbar(scrollbar_T *sb, int flag) /* * Return the RGB value of a pixel as long. */ - long_u + guicolor_T gui_mch_get_rgb(guicolor_T pixel) { #if GTK_CHECK_VERSION(3,0,0) @@ -7031,9 +7031,10 @@ gui_mch_get_rgb(guicolor_T pixel) gdk_colormap_query_color(gtk_widget_get_colormap(gui.drawarea), (unsigned long)pixel, &color); - return (((unsigned)color.red & 0xff00) << 8) + return (guicolor_T)( + (((unsigned)color.red & 0xff00) << 8) | ((unsigned)color.green & 0xff00) - | (((unsigned)color.blue & 0xff00) >> 8); + | (((unsigned)color.blue & 0xff00) >> 8)); #endif } |