summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-23 12:52:40 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-23 12:52:40 +0200
commit62f167f716beb8bfeaadb8ec506a257827f701a2 (patch)
tree88cc0901549503ae2f8730f6337280763c2e2eec
parentc8836f702532b0bc3dd16972e6b504a7340e90e2 (diff)
downloadvim-git-62f167f716beb8bfeaadb8ec506a257827f701a2.tar.gz
updated for version 7.4.259v7.4.259
Problem: Warning for misplaced "const". Solution: Move the "const". (Yukihiro Nakadaira)
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 32701fdc7..b735a13bb 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2815,7 +2815,7 @@ mch_copy_sec(from_file, to_file)
char_u *from_file;
char_u *to_file;
{
- static const char const *smack_copied_attributes[] =
+ static const char * const smack_copied_attributes[] =
{
XATTR_NAME_SMACK,
XATTR_NAME_SMACKEXEC,
diff --git a/src/version.c b/src/version.c
index 6da3fe30e..f8464c0da 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 259,
+/**/
258,
/**/
257,