updated for version 7.3.287
Problem: Can't compile with MSVC and tiny options.
Solution: Move variables and #ifdefs. (Sergey Khorev)
diff --git a/src/os_win32.c b/src/os_win32.c
index 0d8bbf7..fbf077f 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3419,8 +3419,6 @@
{
DWORD availableBytes = 0;
DWORD i;
- int c;
- char_u *p;
int ret;
DWORD len;
DWORD toRead;
@@ -3479,6 +3477,8 @@
else if (has_mbyte)
{
int l;
+ int c;
+ char_u *p;
len += *buffer_off;
buffer[len] = NUL;
@@ -3558,9 +3558,7 @@
int noread_cnt = 0;
garray_T ga;
int delay = 1;
-# ifdef FEAT_MBYTE
DWORD buffer_off = 0; /* valid bytes in buffer[] */
-# endif
SECURITY_ATTRIBUTES saAttr;
@@ -3777,14 +3775,12 @@
if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT)
{
- dump_pipe(options, g_hChildStd_OUT_Rd,
- &ga, buffer, &buffer_off);
+ dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
break;
}
++noread_cnt;
- dump_pipe(options, g_hChildStd_OUT_Rd,
- &ga, buffer, &buffer_off);
+ dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
/* We start waiting for a very short time and then increase it, so
* that we respond quickly when the process is quick, and don't
diff --git a/src/version.c b/src/version.c
index 51f1d25..7642dd6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 287,
+/**/
286,
/**/
285,
