Mercurial > vim
comparison src/os_win32.c @ 8090:54cfe888c627 v7.4.1339
commit https://github.com/vim/vim/commit/418f81b5fa400ed59793384f2f3d9df45390f080
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 16 20:12:02 2016 +0100
patch 7.4.1339
Problem: Warnings when building the GUI with MingW. (Cesar Romani)
Solution: Add type cats. (Yasuhiro Matsumoto)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 16 Feb 2016 20:15:05 +0100 |
parents | 3ea56a74077f |
children | d82fb42b611b |
comparison
equal
deleted
inserted
replaced
8089:e5d330ffb650 | 8090:54cfe888c627 |
---|---|
234 | 234 |
235 static char_u *exe_path = NULL; | 235 static char_u *exe_path = NULL; |
236 | 236 |
237 static BOOL win8_or_later = FALSE; | 237 static BOOL win8_or_later = FALSE; |
238 | 238 |
239 #ifndef FEAT_GUI_W32 | |
239 /* | 240 /* |
240 * Version of ReadConsoleInput() that works with IME. | 241 * Version of ReadConsoleInput() that works with IME. |
241 * Works around problems on Windows 8. | 242 * Works around problems on Windows 8. |
242 */ | 243 */ |
243 static BOOL | 244 static BOOL |
323 LPDWORD lpEvents) | 324 LPDWORD lpEvents) |
324 { | 325 { |
325 return read_console_input(hInput, lpBuffer, -1, lpEvents); | 326 return read_console_input(hInput, lpBuffer, -1, lpEvents); |
326 } | 327 } |
327 | 328 |
329 # ifdef FEAT_CLIENTSERVER | |
328 static DWORD | 330 static DWORD |
329 msg_wait_for_multiple_objects( | 331 msg_wait_for_multiple_objects( |
330 DWORD nCount, | 332 DWORD nCount, |
331 LPHANDLE pHandles, | 333 LPHANDLE pHandles, |
332 BOOL fWaitAll, | 334 BOOL fWaitAll, |
336 if (read_console_input(NULL, NULL, -2, NULL)) | 338 if (read_console_input(NULL, NULL, -2, NULL)) |
337 return WAIT_OBJECT_0; | 339 return WAIT_OBJECT_0; |
338 return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, | 340 return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, |
339 dwMilliseconds, dwWakeMask); | 341 dwMilliseconds, dwWakeMask); |
340 } | 342 } |
341 | 343 # endif |
342 #ifndef FEAT_CLIENTSERVER | 344 |
345 # ifndef FEAT_CLIENTSERVER | |
343 static DWORD | 346 static DWORD |
344 wait_for_single_object( | 347 wait_for_single_object( |
345 HANDLE hHandle, | 348 HANDLE hHandle, |
346 DWORD dwMilliseconds) | 349 DWORD dwMilliseconds) |
347 { | 350 { |
348 if (read_console_input(NULL, NULL, -2, NULL)) | 351 if (read_console_input(NULL, NULL, -2, NULL)) |
349 return WAIT_OBJECT_0; | 352 return WAIT_OBJECT_0; |
350 return WaitForSingleObject(hHandle, dwMilliseconds); | 353 return WaitForSingleObject(hHandle, dwMilliseconds); |
351 } | 354 } |
355 # endif | |
356 #endif | |
352 #endif | 357 #endif |
353 | 358 |
354 static void | 359 static void |
355 get_exe_name(void) | 360 get_exe_name(void) |
356 { | 361 { |