summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-20 20:55:56 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-20 20:55:56 +0200
commit4445f7ee708f1a1304526a5979c9dd9883a92a0a (patch)
treec6fb468122d466ebb488e53343f033e39849ff2b
parent40b1b5443c88fab77f1f7c6f9e801f7ffdb7e0a8 (diff)
patch 7.4.1760v7.4.1760
Problem: Compiler warning for unused variable. Solution: Add #ifdef. (John Marriott)
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 159905d0b0..dfc0d4d741 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -1446,7 +1446,9 @@ WaitForChar(long msec)
INPUT_RECORD ir;
DWORD cRecords;
WCHAR ch, ch2;
+#ifdef FEAT_TIMERS
int tb_change_cnt = typebuf.tb_change_cnt;
+#endif
if (msec > 0)
/* Wait until the specified time has elapsed. */
diff --git a/src/version.c b/src/version.c
index f550196cb3..eeff8c6f5d 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 */
/**/
+ 1760,
+/**/
1759,
/**/
1758,