Mercurial > vim
diff src/gui_w32.c @ 7743:6069f43cea4e v7.4.1169
commit https://github.com/vim/vim/commit/e0874f8cbcddfcf9965a85ba35199964efb1d01a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 24 20:36:41 2016 +0100
patch 7.4.1169
Problem: The socket I/O is intertwined with the netbeans code.
Solution: Start refactoring the netbeans communication to split off the
socket I/O. Add the +channel feature.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 24 Jan 2016 20:45:05 +0100 |
| parents | fb84355cd972 |
| children | 0d46cea25641 |
line wrap: on
line diff
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -553,7 +553,7 @@ typedef BOOL (WINAPI *TGetMonitorInfo)(_ static TMonitorFromWindow pMonitorFromWindow = NULL; static TGetMonitorInfo pGetMonitorInfo = NULL; static HANDLE user32_lib = NULL; -#ifdef FEAT_NETBEANS_INTG +#ifdef FEAT_CHANNEL int WSInitialized = FALSE; /* WinSock is initialized */ #endif /* @@ -5048,12 +5048,14 @@ netbeans_draw_multisign_indicator(int ro SetPixel(s_hdc, x+3, y++, gui.currFgColor); SetPixel(s_hdc, x+2, y, gui.currFgColor); } - +#endif + +#if defined(FEAT_CHANNEL) || defined(PROTO) /* * Initialize the Winsock dll. */ void -netbeans_init_winsock() +channel_init_winsock() { WSADATA wsaData; int wsaerr;