diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-24 20:36:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-24 20:36:41 +0100 |
| commit | e0874f8cbcddfcf9965a85ba35199964efb1d01a (patch) | |
| tree | 02cba2d1d135a96e3983f0676bb11da770ab0426 /src/gui_w32.c | |
| parent | 705ada1aff27ecd9c47c690df817d043c2ceb5e2 (diff) | |
| download | vim-git-e0874f8cbcddfcf9965a85ba35199964efb1d01a.tar.gz | |
patch 7.4.1169v7.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.
Diffstat (limited to 'src/gui_w32.c')
| -rw-r--r-- | src/gui_w32.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index db0a9d5bf..ecc1fab41 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -553,7 +553,7 @@ typedef BOOL (WINAPI *TGetMonitorInfo)(_HMONITOR, _MONITORINFO *); 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 row) 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; |