patch 7.4.1725

Problem:    Compiler errors for non-ANSI compilers.
Solution:   Remove // comment.  Remove comma at end of enum. (Michael Jarvis)

diff --git a/src/eval.c b/src/eval.c
index 0c270b928d4c68476939be063488e9a8d071a3f4..a14a721a0e0276bb7fbd57b26db92244dd0bf74d 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -7005,7 +7005,7 @@ garbage_collect(void)
 #endif
 
 #ifdef FEAT_JOB_CHANNEL
-//    abort = abort || set_ref_in_channel(copyID);
+    abort = abort || set_ref_in_channel(copyID);
 #endif
 
     if (!abort)
@@ -9472,7 +9472,7 @@ typedef enum
     ASSERT_NOTEQUAL,
     ASSERT_MATCH,
     ASSERT_NOTMATCH,
-    ASSERT_OTHER,
+    ASSERT_OTHER
 } assert_type_T;
 
 static void prepare_assert_error(garray_T*gap);

diff --git a/src/version.c b/src/version.c
index e422527ef2a50616f01da7bf8908a4c82cceb10a..5ca02192fc9bee4f62d4e0b70a68a7bb82c852a8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1725,
 /**/
     1724,
 /**/