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 | 8872ef1b4e1b304cc168ea4c8f68645498c155be (patch) | |
| tree | b982de6057fa3faee9103cd2dc8a8fca95bdbbe8 | |
| parent | 494838a3fec2fb1abcac6256271810a762225bed (diff) | |
| download | vim-git-8872ef1b4e1b304cc168ea4c8f68645498c155be.tar.gz | |
updated for version 7.4.628v7.4.628
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
diff --git a/src/main.c b/src/main.c index ec83d8f14..885192bed 100644 --- a/src/main.c +++ b/src/main.c @@ -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 9a813d7ba..ce0b57bf3 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, |