From: Bram Moolenaar Date: Tue, 25 Aug 2015 17:49:50 +0000 (+0200) Subject: patch 7.4.837 X-Git-Tag: v7.4.837 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80ce282107849ef1a0e9b8a3be26c59c211b0957;p=vim patch 7.4.837 Problem: Compiler warning with MSVC compiler when using +sniff. Solution: Use Sleep() instead of _sleep(). (Tux) --- diff --git a/src/if_sniff.c b/src/if_sniff.c index 5cacb72f6..bfdc68bfa 100644 --- 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 diff --git a/src/version.c b/src/version.c index 08d114011..57ff84c32 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 837, /**/ 836, /**/