diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-11-06 11:27:46 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-06 11:27:46 +0000 |
| commit | a25f718431ae001242a6a8b74733ee7685ccf07d (patch) | |
| tree | 3561e94c7f3f901ca0d71bc9c5071b543a199438 | |
| parent | cd9c8d400c1eb9cbb4ff6a33be02f91a30ab13b2 (diff) | |
| download | vim-git-9.0.0838.tar.gz | |
patch 9.0.0838: compiler warnings for unused variablesv9.0.0838
Problem: Compiler warnings for unused variables.
Solution: Addjust #ifdef and remove unused variables. (John Marriott)
| -rw-r--r-- | src/gui.c | 7 | ||||
| -rw-r--r-- | src/gui_w32.c | 3 | ||||
| -rw-r--r-- | src/os_win32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 8 deletions
@@ -64,7 +64,9 @@ static int disable_flush = 0; // If > 0, gui_mch_flush() is disabled. gui_start(char_u *arg UNUSED) { char_u *old_term; +#ifdef GUI_MAY_FORK static int recursive = 0; +#endif #if defined(GUI_MAY_SPAWN) && defined(EXPERIMENTAL_GUI_CMD) char *msg = NULL; #endif @@ -76,9 +78,8 @@ gui_start(char_u *arg UNUSED) cursor_on(); // needed for ":gui" in .vimrc full_screen = FALSE; - ++recursive; - #ifdef GUI_MAY_FORK + ++recursive; /* * Quit the current process and continue in the child. * Makes "gvim file" disconnect from the shell it was started in. @@ -153,7 +154,9 @@ gui_start(char_u *arg UNUSED) gui_mch_update(); apply_autocmds(gui.in_use ? EVENT_GUIENTER : EVENT_GUIFAILED, NULL, NULL, FALSE, curbuf); +#ifdef GUI_MAY_FORK --recursive; +#endif } /* diff --git a/src/gui_w32.c b/src/gui_w32.c index 8424c6cef..9399c930e 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -6190,13 +6190,11 @@ gui_mch_draw_string( // handled here. int i; int wlen; // string length in words - int clen; // string length in characters int cells; // cell width of string up to composing char int cw; // width of current cell int c; wlen = 0; - clen = 0; cells = 0; for (i = 0; i < len; ) { @@ -6236,7 +6234,6 @@ gui_mch_draw_string( } cells += cw; i += utf_ptr2len_len(text + i, len - i); - ++clen; } #if defined(FEAT_DIRECTX) if (IS_ENABLE_DIRECTX()) diff --git a/src/os_win32.c b/src/os_win32.c index fc6ea5ea3..b5ded95d5 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4394,7 +4394,6 @@ dump_pipe(int options, int ret; DWORD len; DWORD toRead; - int repeatCount; // we query the pipe to see if there is any data to read // to avoid to perform a blocking read @@ -4405,11 +4404,9 @@ dump_pipe(int options, &availableBytes, // available bytes total NULL); // byteLeft - repeatCount = 0; // We got real data in the pipe, read it while (ret != 0 && availableBytes > 0) { - repeatCount++; toRead = (DWORD)(BUFLEN - *buffer_off); toRead = availableBytes < toRead ? availableBytes : toRead; ReadFile(g_hChildStd_OUT_Rd, buffer + *buffer_off, toRead , &len, NULL); diff --git a/src/version.c b/src/version.c index 56ccb053a..6aef2c131 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 838, +/**/ 837, /**/ 836, |