summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-16 15:06:59 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-16 15:06:59 +0100
commit6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c (patch)
treed2277cebb1354524326ac1333b3bd47f7453c456 /src/option.c
parentf8df7addc5f741c16fa2a458f8777ac1fdf2e01e (diff)
downloadvim-git-6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c.tar.gz
patch 7.4.1334v7.4.1334
Problem: Many compiler warnings with MingW. Solution: Add type casts. (Yasuhiro Matsumoto)
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index 72d8cf7a6..6554fcd01 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3196,7 +3196,7 @@ set_init_1(void)
# endif
|| ((p = mch_getenv((char_u *)"COMSPEC")) != NULL && *p != NUL)
# ifdef WIN3264
- || ((p = default_shell()) != NULL && *p != NUL)
+ || ((p = (char_u *)default_shell()) != NULL && *p != NUL)
# endif
#endif
)
@@ -3479,7 +3479,7 @@ set_init_1(void)
STRCPY(buf, "ja");
else
buf[2] = NUL; /* truncate to two-letter code */
- vim_setenv("LANG", buf);
+ vim_setenv((char_u *)"LANG", (char_u *)buf);
}
}
# else