From 2eba18255ea36927ea0acc6d45b7be03ca94a139 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 27 Aug 2011 15:10:04 +0200
Subject: updated for version 7.3.287 Problem:    Can't compile with MSVC and
 tiny options. Solution:   Move variables and #ifdefs. (Sergey Khorev)

---
 src/os_win32.c | 12 ++++--------
 src/version.c  |  2 ++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index 0d8bbf7d3..fbf077f6f 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3419,8 +3419,6 @@ dump_pipe(int	    options,
 {
     DWORD	availableBytes = 0;
     DWORD	i;
-    int		c;
-    char_u	*p;
     int		ret;
     DWORD	len;
     DWORD	toRead;
@@ -3479,6 +3477,8 @@ dump_pipe(int	    options,
 	else if (has_mbyte)
 	{
 	    int		l;
+	    int		c;
+	    char_u	*p;
 
 	    len += *buffer_off;
 	    buffer[len] = NUL;
@@ -3558,9 +3558,7 @@ mch_system_piped(char *cmd, int options)
     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 @@ mch_system_piped(char *cmd, int options)
 
 	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 51f1d2561..7642dd6b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    287,
 /**/
     286,
 /**/
-- 
cgit v1.2.1