aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1460

Browse Source 
Problem:    Syntax error in rarily used code.
Solution:   Fix the mch_rename() declaration. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2016-02-29 12:52:39 +01:00
parent e081e21f76
commit fdcc9afb71
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os_unix.c
View File

@ -6454,14 +6454,14 @@ have_dollars(int num, char_u **file)
} }
#endif /* ifndef __EMX__ */ #endif /* ifndef __EMX__ */
#ifndef HAVE_RENAME #if !defined(HAVE_RENAME) || defined(PROTO)
/* /*
* Scaled-down version of rename(), which is missing in Xenix. * Scaled-down version of rename(), which is missing in Xenix.
* This version can only move regular files and will fail if the * This version can only move regular files and will fail if the
* destination exists. * destination exists.
*/ */
int int
mch_rename(const char *src, *dest) mch_rename(const char *src, const char *dest)
{ {
struct stat st; struct stat st;

1
src/proto/os_unix.pro
View File

@ -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_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_exp_wildcard(char_u *p);
int mch_has_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); 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 setup_term_clip(void);
void start_xterm_trace(int button); void start_xterm_trace(int button);

2
src/version.c
View File

@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1460,
/**/ /**/
1459, 1459,
/**/ /**/