diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-12 22:18:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-12 22:18:53 +0200 |
| commit | 3780bb923a688e0051a9a23474eeb38a8acb695a (patch) | |
| tree | 0670ec7af05a34fad5161b402b3861d291a148f0 /src | |
| parent | 03413f44167c4b5cd0012def9bb331e2518c83cf (diff) | |
patch 7.4.1725v7.4.1725
Problem: Compiler errors for non-ANSI compilers.
Solution: Remove // comment. Remove comma at end of enum. (Michael Jarvis)
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 0c270b928d..a14a721a0e 100644 --- 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 e422527ef2..5ca02192fc 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1725, +/**/ 1724, /**/ 1723, |