aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.1242

Browse Source 
Problem:    json_test fails without the eval feature.
Solution:   Add #ifdef.
This commit is contained in:
Bram Moolenaar
2016-02-02 19:15:38 +01:00
parent 04b08c3de6
commit 8d8c509ac8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/json_test.c
View File

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

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1242,
/**/ /**/
1241, 1241,
/**/ /**/