diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2014-11-16 17:27:44 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2014-11-16 17:30:17 +0000 |
| commit | 4be80d5109a340973dc6ce0221ec5c5761587df0 (patch) | |
| tree | d469b8fd5a9d3b70dd4dd1c85b0d63530b1e58af /lib/curl_threads.c | |
| parent | 23e70e1cc65bf7491e78ab13331a141236b64775 (diff) | |
win32: Updated some legacy APIs to use the newer extended versions
Updated the usage of some legacy APIs, that are preventing curl from
compiling for Windows Store and Windows Phone build targets.
Suggested-by: Stefan Neis
Feature: http://sourceforge.net/p/curl/feature-requests/82/
Diffstat (limited to 'lib/curl_threads.c')
| -rw-r--r-- | lib/curl_threads.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/curl_threads.c b/lib/curl_threads.c index d40e024c8..5b7013914 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -123,7 +123,12 @@ void Curl_thread_destroy(curl_thread_t hnd) int Curl_thread_join(curl_thread_t *hnd) { +#if !defined(_WIN32_WINNT) || !defined(_WIN32_WINNT_VISTA) || \ + (_WIN32_WINNT < _WIN32_WINNT_VISTA) int ret = (WaitForSingleObject(*hnd, INFINITE) == WAIT_OBJECT_0); +#else + int ret = (WaitForSingleObjectEx(*hnd, INFINITE, FALSE) == WAIT_OBJECT_0); +#endif Curl_thread_destroy(*hnd); |