patch 7.4.1242

Problem:    json_test fails without the eval feature.
Solution:   Add #ifdef.

diff --git a/src/json_test.c b/src/json_test.c
index 04165439221283d2d0e6770397ae3efbf4321eaf..f50c95608b34f4e74907668ea3a7b788187af2d0 100644 (file)
--- a/src/json_test.c
+++ b/src/json_test.c
@@ -21,6 +21,7 @@
 /* This file has to be included because the tested functions are static */
 #include "json.c"
 
+#if defined(FEAT_EVAL)
 /*
  * Test json_find_end() with imcomplete items.
  */
@@ -182,12 +183,15 @@ test_fill_called_on_string(void)
     reader.js_cookie =        " \"foobar\"  ";
     assert(json_decode_string(&reader, NULL) == OK);
 }
+#endif
 
     int
 main(void)
 {
+#if defined(FEAT_EVAL)
     test_decode_find_end();
     test_fill_called_on_find_end();
     test_fill_called_on_string();
+#endif
     return 0;
 }

diff --git a/src/version.c b/src/version.c
index 39090d4fedb1a859cd58655d99960bcaa667f3d7..b252d993752189a97fcbd5bd60dcab13ca90507f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1242,
 /**/
     1241,
 /**/