From 80ce282107849ef1a0e9b8a3be26c59c211b0957 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 25 Aug 2015 19:49:50 +0200 Subject: [PATCH] patch 7.4.837 Problem: Compiler warning with MSVC compiler when using +sniff. Solution: Use Sleep() instead of _sleep(). (Tux) --- src/if_sniff.c | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/if_sniff.c b/src/if_sniff.c index 5cacb72f66..bfdc68bfa6 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 08d1140119..57ff84c32a 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, /**/