summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-13 21:22:12 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-13 21:22:12 +0100
commit18442cbcc0d335a8ea6947e94eee9a2ab9552690 (patch)
treeee2900bcf88d4f9da2ac3cfa8244a355e6a27aac
parent943e9639a9ecb08bdec78ae6695c917bca6210b9 (diff)
downloadvim-git-8.1.0912.tar.gz
patch 8.1.0912: MS-Windows: warning for signed/unsignedv8.1.0912
Problem: MS-Windows: warning for signed/unsigned. Solution: Add type cast. (Nobuhiro Takasaki, closes #3945)
-rw-r--r--src/terminal.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 3be269858..a823499ed 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -5722,7 +5722,7 @@ conpty_term_and_job_init(
job->jv_proc_info = proc_info;
job->jv_job_object = jo;
job->jv_status = JOB_STARTED;
- job->jv_tty_type = vim_strsave("conpty");
+ job->jv_tty_type = vim_strsave((char_u *)"conpty");
++job->jv_refcount;
term->tl_job = job;
@@ -6056,7 +6056,7 @@ winpty_term_and_job_init(
(short_u *)winpty_conin_name(term->tl_winpty), NULL);
job->jv_tty_out = utf16_to_enc(
(short_u *)winpty_conout_name(term->tl_winpty), NULL);
- job->jv_tty_type = vim_strsave("winpty");
+ job->jv_tty_type = vim_strsave((char_u *)"winpty");
++job->jv_refcount;
term->tl_job = job;
diff --git a/src/version.c b/src/version.c
index 88960bafd..343270cc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 912,
+/**/
911,
/**/
910,