summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-01-26 18:52:06 +0100
committerBram Moolenaar <bram@vim.org>2012-01-26 18:52:06 +0100
commit5b85f924cd423acfe431f439540527487c1c9d3f (patch)
tree7c2c6368fabc461632572d3cd170e613d71a6040
parentc8eea6124b7efff94269445500fa1965d6dcec4a (diff)
downloadvim-5b85f924cd423acfe431f439540527487c1c9d3f.tar.gz
updated for version 7.3.416v7.3.416v7-3-416
Problem: Compiler warning for wrong pointer. Solution: Add type cast.
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index c63a5e0e..7b4095ee 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21802,7 +21802,7 @@ get_user_func_name(xp, idx)
fp = HI2UF(hi);
if (fp->uf_flags & FC_DICT)
- return ""; /* don't show dict functions */
+ return (char_u *)""; /* don't show dict functions */
if (STRLEN(fp->uf_name) + 4 >= IOSIZE)
return fp->uf_name; /* prevents overflow */
diff --git a/src/version.c b/src/version.c
index cdd57ad1..4e78bd71 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 416,
+/**/
415,
/**/
414,