summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-26 23:39:55 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-26 23:39:55 +0100
commitfb4194e4e0d6bd2df43c3e75a969866fcb103f6b (patch)
tree423b07920df43411477e265d78602d515e0fe6b2
parentd04a020a8a8d7a438b091d49218c438880beb50c (diff)
patch 7.4.1183v7.4.1183
Problem: MS-Windows build is broken. Solution: Remove init in wrong place.
-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 bb7db7e49a..549c00fda5 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -92,7 +92,7 @@ typedef struct {
gint ch_inputHandler; /* Cookie for input */
#endif
#ifdef FEAT_GUI_W32
- int ch_inputHandler = -1; /* simply ret.value of WSAAsyncSelect() */
+ int ch_inputHandler; /* simply ret.value of WSAAsyncSelect() */
#endif
void (*ch_close_cb)(void); /* callback invoked when channel is closed */
diff --git a/src/version.c b/src/version.c
index 503d94107b..b901d01749 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1183,
+/**/
1182,
/**/
1181,