patch 7.4.1460

Problem:    Syntax error in rarily used code.
Solution:   Fix the mch_rename() declaration. (Ken Takata)

diff --git a/src/os_unix.c b/src/os_unix.c
index 360259a67f7943f85fbabd8c998f31f9f27c68ad..53d32f709a28401caac480ff36f142817072e8fe 100644 (file)
--- 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 25d25797e16fc4d7b22444d5e3bfabd5cb75adbf..1d025e8284d60def3ab3827162da8fdc0ea1aca9 100644 (file)
--- 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 f9f412801a428be9095d20cb188fbc4ea5e98b24..e4499f15b0d60c0f2ca6da1b1d531593408f6f0b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1460,
 /**/
     1459,
 /**/