summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-19 21:06:58 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-19 21:06:58 +0100
commit63c0ccd2b68ce854f294e6f149cc700c7f543674 (patch)
tree7c0652ffe1d5314027fa890822f72f4149583111
parent2d951a486e632f99fe039c0b0a1685f1fe7879b2 (diff)
downloadvim-git-63c0ccd2b68ce854f294e6f149cc700c7f543674.tar.gz
patch 8.1.0783: compiler warning for signed/unsignedv8.1.0783
Problem: Compiler warning for signed/unsigned. Solution: Add type cast. Change type of buffer. (Ozaki Kiichi, closes #3827)
-rw-r--r--src/main.c2
-rw-r--r--src/message.c8
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 18be06cc8..2fafe9401 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1288,7 +1288,7 @@ main_loop(
* string here. Don't reset keep_msg, msg_attr_keep() uses it
* to check for duplicates. */
p = keep_msg;
- msg_attr(p, keep_msg_attr);
+ msg_attr((char *)p, keep_msg_attr);
vim_free(p);
}
if (need_fileinfo) /* show file info after redraw */
diff --git a/src/message.c b/src/message.c
index 448173c0b..0c3b5324d 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1389,9 +1389,9 @@ msg_putchar(int c)
msg_putchar_attr(int c, int attr)
{
#ifdef FEAT_MBYTE
- char buf[MB_MAXBYTES + 1];
+ char_u buf[MB_MAXBYTES + 1];
#else
- char buf[4];
+ char_u buf[4];
#endif
if (IS_SPECIAL(c))
@@ -1404,13 +1404,13 @@ msg_putchar_attr(int c, int attr)
else
{
#ifdef FEAT_MBYTE
- buf[(*mb_char2bytes)(c, (char_u *)buf)] = NUL;
+ buf[(*mb_char2bytes)(c, buf)] = NUL;
#else
buf[0] = c;
buf[1] = NUL;
#endif
}
- msg_puts_attr(buf, attr);
+ msg_puts_attr((char *)buf, attr);
}
void
diff --git a/src/version.c b/src/version.c
index 6f8f87442..11e4bb682 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 783,
+/**/
782,
/**/
781,