Mercurial > vim
changeset 8336:d44ff1525ff0 v7.4.1460
commit https://github.com/vim/vim/commit/fdcc9afb71ea88fe63bbed8bad0d5bae607bfb73
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Feb 29 12:52:39 2016 +0100
patch 7.4.1460
Problem: Syntax error in rarily used code.
Solution: Fix the mch_rename() declaration. (Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 29 Feb 2016 13:00:04 +0100 |
| parents | 13fa98c154ba |
| children | 73ce5408007f |
| files | src/os_unix.c src/proto/os_unix.pro src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -6454,14 +6454,14 @@ have_dollars(int num, char_u **file) } #endif /* ifndef __EMX__ */ -#ifndef HAVE_RENAME +#if !defined(HAVE_RENAME) || defined(PROTO) /* * Scaled-down version of rename(), which is missing in Xenix. * This version can only move regular files and will fail if the * destination exists. */ int -mch_rename(const char *src, *dest) +mch_rename(const char *src, const char *dest) { struct stat st;
--- a/src/proto/os_unix.pro +++ b/src/proto/os_unix.pro @@ -66,6 +66,7 @@ int mch_expandpath(garray_T *gap, char_u int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file, int flags); int mch_has_exp_wildcard(char_u *p); int mch_has_wildcard(char_u *p); +int mch_rename(const char *src, const char *dest); int mch_libcall(char_u *libname, char_u *funcname, char_u *argstring, int argint, char_u **string_result, int *number_result); void setup_term_clip(void); void start_xterm_trace(int button);