diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-26 23:49:31 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-26 23:49:31 +0100 |
commit | 54e09e71984af6db92f3ad37ce390630a23407af (patch) | |
tree | 7a76bd99bf5cd9ae5e0fa1378c03fbc188aeca23 /src | |
parent | fb4194e4e0d6bd2df43c3e75a969866fcb103f6b (diff) | |
download | vim-54e09e71984af6db92f3ad37ce390630a23407af.zip |
patch 7.4.1184
Problem: MS-Windows build is still broken.
Solution: Change nbsock to ch_fd.
Diffstat (limited to 'src')
-rw-r--r-- | src/channel.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/channel.c b/src/channel.c index 549c00fda..d57c24fa4 100644 --- a/src/channel.c +++ b/src/channel.c @@ -253,7 +253,7 @@ channel_gui_unregister(int idx) # ifdef FEAT_GUI_W32 if (channel->ch_inputHandler == 0) { - WSAAsyncSelect(nbsock, s_hwnd, 0, 0); + WSAAsyncSelect(channel->ch_fd, s_hwnd, 0, 0); channel->ch_inputHandler = -1; } # endif diff --git a/src/version.c b/src/version.c index b901d0174..1efe23d18 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 */ /**/ + 1184, +/**/ 1183, /**/ 1182, |