Mercurial > vim

changeset 7049:2ebc20378f68 v7.4.837

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/80ce282107849ef1a0e9b8a3be26c59c211b0957 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 25 19:49:50 2015 +0200 patch 7.4.837 Problem: Compiler warning with MSVC compiler when using +sniff. Solution: Use Sleep() instead of _sleep(). (Tux)
author Christian Brabandt <cb@256bit.org>
date Tue, 25 Aug 2015 20:00:05 +0200
parents bead547f5dc7
children 2ddd6c9ec05f
files src/if_sniff.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/if_sniff.c
+++ b/src/if_sniff.c
@@ -655,7 +655,11 @@ sniff_disconnect(immediately)
     else
     {
 #ifdef WIN32
+# if (defined(_MSC_VER) && _MSC_VER >= 1400)
+        Sleep(2);
+# else
 	_sleep(2);
+# endif
 	if (!sniff_request_processed)
 	    ProcessSniffRequests();
 #else
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    837,
+/**/
     836,
 /**/
     835,