aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.3.287

Browse Source 
Problem:    Can't compile with MSVC and tiny options.
Solution:   Move variables and #ifdefs. (Sergey Khorev)
This commit is contained in:
Bram Moolenaar
2011-08-27 15:10:04 +02:00
parent c9927c136f
commit 2eba18255e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/os_win32.c
View File

@@ -3419,8 +3419,6 @@ dump_pipe(int options,
{ {
DWORD availableBytes = 0; DWORD availableBytes = 0;
DWORD i; DWORD i;
int c;
char_u *p;
int ret; int ret;
DWORD len; DWORD len;
DWORD toRead; DWORD toRead;
@@ -3479,6 +3477,8 @@ dump_pipe(int options,
else if (has_mbyte) else if (has_mbyte)
{ {
int l; int l;
int c;
char_u *p;
len += *buffer_off; len += *buffer_off;
buffer[len] = NUL; buffer[len] = NUL;
@@ -3558,9 +3558,7 @@ mch_system_piped(char *cmd, int options)
int noread_cnt = 0; int noread_cnt = 0;
garray_T ga; garray_T ga;
int delay = 1; int delay = 1;
# ifdef FEAT_MBYTE
DWORD buffer_off = 0; /* valid bytes in buffer[] */ DWORD buffer_off = 0; /* valid bytes in buffer[] */
# endif
SECURITY_ATTRIBUTES saAttr; SECURITY_ATTRIBUTES saAttr;
@@ -3777,14 +3775,12 @@ mch_system_piped(char *cmd, int options)
if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT) if (WaitForSingleObject(pi.hProcess, delay) != WAIT_TIMEOUT)
{ {
dump_pipe(options, g_hChildStd_OUT_Rd, dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
&ga, buffer, &buffer_off);
break; break;
} }
++noread_cnt; ++noread_cnt;
dump_pipe(options, g_hChildStd_OUT_Rd, dump_pipe(options, g_hChildStd_OUT_Rd, &ga, buffer, &buffer_off);
&ga, buffer, &buffer_off);
/* We start waiting for a very short time and then increase it, so /* 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 * that we respond quickly when the process is quick, and don't

2
src/version.c
View File

@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
287,
/**/ /**/
286, 286,
/**/ /**/