diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-02 19:15:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-02 19:15:38 +0100 |
| commit | 8d8c509ac8dea59ad07712971d74afae08521f79 (patch) | |
| tree | 1bedd43a8f1f9568f97b4a064833daa97b9c1567 /src | |
| parent | 04b08c3de68534adff95c8823787299e07ed3b49 (diff) | |
| download | vim-8d8c509ac8dea59ad07712971d74afae08521f79.zip | |
patch 7.4.1242
Problem: json_test fails without the eval feature.
Solution: Add #ifdef.
Diffstat (limited to 'src')
| -rw-r--r-- | src/json_test.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/json_test.c b/src/json_test.c index 041654392..f50c95608 100644 --- 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 39090d4fe..b252d9937 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1242, +/**/ 1241, /**/ 1240, |