Skip to content

Commit 8d8c509

Browse files
committed
patch 7.4.1242
Problem: json_test fails without the eval feature. Solution: Add #ifdef.
1 parent 04b08c3 commit 8d8c509

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/json_test.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/* This file has to be included because the tested functions are static */
2222
#include "json.c"
2323

24+
#if defined(FEAT_EVAL)
2425
/*
2526
* Test json_find_end() with imcomplete items.
2627
*/
@@ -182,12 +183,15 @@ test_fill_called_on_string(void)
182183
reader.js_cookie = " \"foobar\" ";
183184
assert(json_decode_string(&reader, NULL) == OK);
184185
}
186+
#endif
185187

186188
int
187189
main(void)
188190
{
191+
#if defined(FEAT_EVAL)
189192
test_decode_find_end();
190193
test_fill_called_on_find_end();
191194
test_fill_called_on_string();
195+
#endif
192196
return 0;
193197
}

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
1242,
745747
/**/
746748
1241,
747749
/**/

0 commit comments

Comments
 (0)