diff options
author | Bram Moolenaar <bram@vim.org> | 2015-02-10 19:27:05 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2015-02-10 19:27:05 +0100 |
commit | 91cf59da34959a0cdd27ec963966fc8f9ba7639a (patch) | |
tree | 0b4353f5600883c1a7596d44a50bdf374fa885d4 | |
parent | 6d6a5e8cc5adbbc35a977d52bc5afc0d8074dc49 (diff) | |
download | vim-91cf59da34959a0cdd27ec963966fc8f9ba7639a.tar.gz |
Problem: Compiler warning for variable might be clobbered by longjmp.
Solution: Add volatile. (Michael Jarvis)
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1051,7 +1051,7 @@ main_loop(cmdwin, noexmode) int noexmode; /* TRUE when return on entering Ex mode */ { oparg_T oa; /* operator arguments */ - int previous_got_int = FALSE; /* "got_int" was TRUE */ + volatile int previous_got_int = FALSE; /* "got_int" was TRUE */ #ifdef FEAT_CONCEAL linenr_T conceal_old_cursor_line = 0; linenr_T conceal_new_cursor_line = 0; diff --git a/src/version.c b/src/version.c index 9a813d7b..ce0b57bf 100644 --- 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 */ /**/ + 628, +/**/ 627, /**/ 626, |