Mercurial > vim

comparison src/os_mswin.c @ 8493:caed4b2d305f v7.4.1537

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/509ce2a558e7e0c03242e32e844255af52f1c821 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 11 22:52:15 2016 +0100 patch 7.4.1537 Problem: Too many feature flags for pipes, jobs and channels. Solution: Only use FEAT_JOB_CHANNEL.
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Mar 2016 23:00:06 +0100
parents 563c923b1584
children 2f57bbe870ea
comparison
equal deleted inserted replaced
8492:a2a51c928924 8493:caed4b2d305f
142 extern HWND s_hwnd; 142 extern HWND s_hwnd;
143 #else 143 #else
144 static HWND s_hwnd = 0; /* console window handle, set by GetConsoleHwnd() */ 144 static HWND s_hwnd = 0; /* console window handle, set by GetConsoleHwnd() */
145 #endif 145 #endif
146 146
147 #ifdef FEAT_CHANNEL 147 #ifdef FEAT_JOB_CHANNEL
148 int WSInitialized = FALSE; /* WinSock is initialized */ 148 int WSInitialized = FALSE; /* WinSock is initialized */
149 #endif 149 #endif
150 150
151 /* Don't generate prototypes here, because some systems do have these 151 /* Don't generate prototypes here, because some systems do have these
152 * functions. */ 152 * functions. */
214 ml_close_all(TRUE); /* remove all memfiles */ 214 ml_close_all(TRUE); /* remove all memfiles */
215 215
216 # ifdef FEAT_OLE 216 # ifdef FEAT_OLE
217 UninitOLE(); 217 UninitOLE();
218 # endif 218 # endif
219 # ifdef FEAT_CHANNEL 219 # ifdef FEAT_JOB_CHANNEL
220 if (WSInitialized) 220 if (WSInitialized)
221 { 221 {
222 WSInitialized = FALSE; 222 WSInitialized = FALSE;
223 WSACleanup(); 223 WSACleanup();
224 } 224 }
3016 return ret; 3016 return ret;
3017 } 3017 }
3018 3018
3019 #endif /* defined(FEAT_GUI) || defined(FEAT_PRINTER) */ 3019 #endif /* defined(FEAT_GUI) || defined(FEAT_PRINTER) */
3020 3020
3021 #if defined(FEAT_CHANNEL) || defined(PROTO) 3021 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
3022 /* 3022 /*
3023 * Initialize the Winsock dll. 3023 * Initialize the Winsock dll.
3024 */ 3024 */
3025 void 3025 void
3026 channel_init_winsock(void) 3026 channel_init_winsock(void)