diff options
author | Brad King <brad.king@kitware.com> | 2017-10-11 12:13:44 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-11 12:14:44 (GMT) |
commit | 48a58e91a6c50539260fb9744b98fb8857a8803c (patch) | |
tree | 92349f6ad61e76ce97867a273ec2cf6bc1eb563a /Utilities/cmcurl/lib/vtls/polarssl_threadlock.c | |
parent | 6ada7f2e9baab9a75084d162a8ea2114487b3291 (diff) | |
parent | bb7591487d95ff9b638c7c1702a8dca2a9e39b45 (diff) | |
download | CMake-48a58e91a6c50539260fb9744b98fb8857a8803c.zip CMake-48a58e91a6c50539260fb9744b98fb8857a8803c.tar.gz CMake-48a58e91a6c50539260fb9744b98fb8857a8803c.tar.bz2 |
Merge topic 'update-curl'
bb759148 curl: Update build within CMake to account for 7.56 changes
9e3ef40e Merge branch 'upstream-curl' into update-curl
de7c21d6 curl 2017-10-04 (3ea76790)
2fad0e20 curl: Update script to get curl 7.56.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1372
Diffstat (limited to 'Utilities/cmcurl/lib/vtls/polarssl_threadlock.c')
-rw-r--r-- | Utilities/cmcurl/lib/vtls/polarssl_threadlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/vtls/polarssl_threadlock.c b/Utilities/cmcurl/lib/vtls/polarssl_threadlock.c index b1eb7b7..dd5fbd7 100644 --- a/Utilities/cmcurl/lib/vtls/polarssl_threadlock.c +++ b/Utilities/cmcurl/lib/vtls/polarssl_threadlock.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2013-2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2013-2017, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010, 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -114,7 +114,7 @@ int Curl_polarsslthreadlock_lock_function(int n) } #elif defined(HAVE_PROCESS_H) if(n < NUMT) { - ret = (WaitForSingleObject(mutex_buf[n], INFINITE)==WAIT_FAILED?1:0); + ret = (WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED?1:0); if(ret) { DEBUGF(fprintf(stderr, "Error: polarsslthreadlock_lock_function failed\n")); |