summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/channel.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c
index 7c649b171..419939897 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -90,7 +90,7 @@ fd_write(sock_T fd, char *buf, size_t len)
if (todo > MAX_NAMED_PIPE_SIZE)
size = MAX_NAMED_PIPE_SIZE;
else
- size = todo;
+ size = (DWORD)todo;
// If the pipe overflows while the job does not read the data, WriteFile
// will block forever. This abandons the write.
memset(&ov, 0, sizeof(ov));
diff --git a/src/version.c b/src/version.c
index 6ceaf23c6..7d63c554d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 838,
+/**/
837,
/**/
836,