diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-29 12:52:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-29 12:52:39 +0100 |
| commit | fdcc9afb71ea88fe63bbed8bad0d5bae607bfb73 (patch) | |
| tree | 949c3218d3a5034d6a6a7a6796346909d10f2c6d | |
| parent | e081e21f760bffc24ca98d5f9bbdb5f02e6aea79 (diff) | |
| download | vim-git-fdcc9afb71ea88fe63bbed8bad0d5bae607bfb73.tar.gz | |
patch 7.4.1460v7.4.1460
Problem: Syntax error in rarily used code.
Solution: Fix the mch_rename() declaration. (Ken Takata)
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/proto/os_unix.pro | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 360259a67..53d32f709 100644 --- 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; diff --git a/src/proto/os_unix.pro b/src/proto/os_unix.pro index 25d25797e..1d025e828 100644 --- a/src/proto/os_unix.pro +++ b/src/proto/os_unix.pro @@ -66,6 +66,7 @@ int mch_expandpath(garray_T *gap, char_u *path, int flags); 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); diff --git a/src/version.c b/src/version.c index f9f412801..e4499f15b 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1460, +/**/ 1459, /**/ 1458, |