summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-25 23:02:11 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-25 23:02:11 +0200
commit424d74bb20335940e938a5b4708fc0d6b73f0de3 (patch)
tree46505b642ec4e3993b909ce34e7e6f9414633b6f
parent015efc32c1add6269099364835ddf85ff257b3c6 (diff)
downloadvim-git-7.4.2252.tar.gz
patch 7.4.2252v7.4.2252
Problem: Compiler warnings for signed/unsigned in expression. Solution: Remove type cast. (Dominique Pelle)
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c
index 3c6d155d6..4fbbb821f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2252,
+/**/
2251,
/**/
2250,
diff --git a/src/vim.h b/src/vim.h
index 898ebb60b..8d49dcd18 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1632,14 +1632,14 @@ typedef UINT32_TYPEDEF UINT32_T;
# define GUI_FUNCTION2(f, pixel) (gui.in_use \
? ((pixel) != INVALCOLOR \
? gui_##f((pixel)) \
- : (long_u)INVALCOLOR) \
+ : INVALCOLOR) \
: termgui_##f((pixel)))
# define USE_24BIT (gui.in_use || p_tgc)
# else
# define GUI_FUNCTION(f) gui_##f
# define GUI_FUNCTION2(f,pixel) ((pixel) != INVALCOLOR \
? gui_##f((pixel)) \
- : (long_u)INVALCOLOR)
+ : INVALCOLOR)
# define USE_24BIT gui.in_use
# endif
#else