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 5cacb72f66979a94a66c246fdf3b433804f27bbb..bfdc68bfa64d04edcc8c6103bfb31d21dc4c9939 100644 (file)
--- 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 08d1140119a0597d5de6c5d54f02d8c3fb2bb5cf..57ff84c32acf0e777b2549ec5e5954f6cb994a17 100644 (file)
--- 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,
 /**/