changeset 2017:9cbe94fd5c8f v7.2.314

updated for version 7.2-314
author vimboss
date Wed, 02 Dec 2009 16:47:11 +0000
parents 03c191181749
children c58b9479e304
files src/misc1.c src/version.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4666,7 +4666,6 @@ concat_fnames(fname1, fname2, sep)
     return dest;
 }
 
-#if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
 /*
  * Concatenate two strings and return the result in allocated memory.
  * Returns NULL when out of memory.
@@ -4687,7 +4686,6 @@ concat_str(str1, str2)
     }
     return dest;
 }
-#endif
 
 /*
  * Add a path separator to a file name, unless it already ends in a path
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    314,
+/**/
     313,
 /**/
     312,