diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-08-25 19:49:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-08-25 19:49:50 +0200 |
| commit | 80ce282107849ef1a0e9b8a3be26c59c211b0957 (patch) | |
| tree | 824d505fa11897f096c8aec79eae9e1f1583c82f | |
| parent | 0a38dd29d6f65aa601162542a5ab0ba7f308fc8e (diff) | |
| download | vim-git-80ce282107849ef1a0e9b8a3be26c59c211b0957.tar.gz | |
patch 7.4.837v7.4.837
Problem: Compiler warning with MSVC compiler when using +sniff.
Solution: Use Sleep() instead of _sleep(). (Tux)
| -rw-r--r-- | src/if_sniff.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 837, +/**/ 836, /**/ 835, |