summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-29 14:17:02 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-29 14:17:02 +0200
commitfe17e7640d242e717e9498158570fe3eea2a769b (patch)
treefb6ce1298e71a1d21b022246e4fb3525f7ab8181 /src/main.c
parent72179e1bd0bbb1d1c3083c85bd9fb0a8d6928f7f (diff)
downloadvim-git-fe17e7640d242e717e9498158570fe3eea2a769b.tar.gz
updated for version 7.3.1262v7.3.1262
Problem: Crash and compilation warnings with Cygwin. Solution: Check return value of XmbTextListToTextProperty(). Add type casts. Adjust #ifdefs. (Lech Lorens)
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 5c1405ea3..884a3082b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2408,7 +2408,7 @@ scripterror:
* Look for evidence of non-Cygwin paths before we bother.
* This is only for when using the Unix files.
*/
- if (strpbrk(p, "\\:") != NULL && !path_with_url(p))
+ if (vim_strpbrk(p, "\\:") != NULL && !path_with_url(p))
{
char posix_path[PATH_MAX];
@@ -2418,7 +2418,7 @@ scripterror:
cygwin_conv_to_posix_path(p, posix_path);
# endif
vim_free(p);
- p = vim_strsave(posix_path);
+ p = vim_strsave((char_u *)posix_path);
if (p == NULL)
mch_exit(2);
}