| To: vim_dev@googlegroups.com |
| Subject: Patch 7.3.571 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.3.571 |
| Problem: Duplicated condition. |
| Solution: Remove one. (Dominique Pelle) |
| Files: src/os_win32.c |
| |
| |
| |
| |
| |
| *** 308,314 **** |
| # ifndef GETTEXT_DLL |
| # define GETTEXT_DLL "libintl.dll" |
| # endif |
| ! /* Dummy funcitons */ |
| static char *null_libintl_gettext(const char *); |
| static char *null_libintl_textdomain(const char *); |
| static char *null_libintl_bindtextdomain(const char *, const char *); |
| --- 308,314 ---- |
| # ifndef GETTEXT_DLL |
| # define GETTEXT_DLL "libintl.dll" |
| # endif |
| ! /* Dummy functions */ |
| static char *null_libintl_gettext(const char *); |
| static char *null_libintl_textdomain(const char *); |
| static char *null_libintl_bindtextdomain(const char *, const char *); |
| |
| *** 1409,1415 **** |
| |
| |
| /* |
| ! * mch_inchar(): low-level input funcion. |
| * Get one or more characters from the keyboard or the mouse. |
| * If time == 0, do not wait for characters. |
| * If time == n, wait a short time for characters. |
| --- 1409,1415 ---- |
| |
| |
| /* |
| ! * mch_inchar(): low-level input function. |
| * Get one or more characters from the keyboard or the mouse. |
| * If time == 0, do not wait for characters. |
| * If time == n, wait a short time for characters. |
| |
| *** 3451,3464 **** |
| * to avoid to perform a blocking read */ |
| ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */ |
| NULL, /* optional buffer */ |
| ! 0, /* buffe size */ |
| NULL, /* number of read bytes */ |
| &availableBytes, /* available bytes total */ |
| NULL); /* byteLeft */ |
| |
| repeatCount = 0; |
| /* We got real data in the pipe, read it */ |
| ! while (ret != 0 && availableBytes > 0 && availableBytes > 0) |
| { |
| repeatCount++; |
| toRead = |
| --- 3451,3464 ---- |
| * to avoid to perform a blocking read */ |
| ret = PeekNamedPipe(g_hChildStd_OUT_Rd, /* pipe to query */ |
| NULL, /* optional buffer */ |
| ! 0, /* buffer size */ |
| NULL, /* number of read bytes */ |
| &availableBytes, /* available bytes total */ |
| NULL); /* byteLeft */ |
| |
| repeatCount = 0; |
| /* We got real data in the pipe, read it */ |
| ! while (ret != 0 && availableBytes > 0) |
| { |
| repeatCount++; |
| toRead = |
| |
| *** 3638,3644 **** |
| NULL, /* Process security attributes */ |
| NULL, /* Thread security attributes */ |
| |
| ! // this command can be litigeous, handle inheritence was |
| // deactivated for pending temp file, but, if we deactivate |
| // it, the pipes don't work for some reason. |
| TRUE, /* Inherit handles, first deactivated, |
| --- 3638,3644 ---- |
| NULL, /* Process security attributes */ |
| NULL, /* Thread security attributes */ |
| |
| ! // this command can be litigious, handle inheritance was |
| // deactivated for pending temp file, but, if we deactivate |
| // it, the pipes don't work for some reason. |
| TRUE, /* Inherit handles, first deactivated, |
| |
| |
| |
| *** 716,717 **** |
| --- 716,719 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 571, |
| /**/ |
| |
| -- |
| hundred-and-one symptoms of being an internet addict: |
| 71. You wonder how people walk |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |