diff options
| author | AlexSm <[email protected]> | 2023-12-22 17:10:22 +0100 | 
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-22 17:10:22 +0100 | 
| commit | 148f920350c60c0ca2d89b637a5aea9093eee450 (patch) | |
| tree | 6314b1433dac833398c333731e83f0ad77e81a0b /contrib/libs/curl/lib/vtls/mbedtls_threadlock.c | |
| parent | 7116d46ae7c0259b5f9d489de263f8701e432b1c (diff) | |
Library import 2 (#639)
Diffstat (limited to 'contrib/libs/curl/lib/vtls/mbedtls_threadlock.c')
| -rw-r--r-- | contrib/libs/curl/lib/vtls/mbedtls_threadlock.c | 17 | 
1 files changed, 9 insertions, 8 deletions
| diff --git a/contrib/libs/curl/lib/vtls/mbedtls_threadlock.c b/contrib/libs/curl/lib/vtls/mbedtls_threadlock.c index 22e579d08c3..fa9fd634c17 100644 --- a/contrib/libs/curl/lib/vtls/mbedtls_threadlock.c +++ b/contrib/libs/curl/lib/vtls/mbedtls_threadlock.c @@ -5,8 +5,8 @@   *                            | (__| |_| |  _ <| |___   *                             \___|\___/|_| \_\_____|   * - * Copyright (C) Daniel Stenberg, <[email protected]>, et al. - * Copyright (C) Hoi-Ho Chan, <[email protected]> + * Copyright (C) 2013 - 2022, Daniel Stenberg, <[email protected]>, et al. + * Copyright (C) 2010, 2011, Hoi-Ho Chan, <[email protected]>   *   * This software is licensed as described in the file COPYING, which   * you should have received as part of this distribution. The terms @@ -26,12 +26,13 @@  #if defined(USE_MBEDTLS) &&                                     \    ((defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) ||   \ -    defined(USE_THREADS_WIN32)) +   (defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)))  #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)  #  include <pthread.h>  #  define MBEDTLS_MUTEX_T pthread_mutex_t -#elif defined(USE_THREADS_WIN32) +#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H) +#  include <process.h>  #  define MBEDTLS_MUTEX_T HANDLE  #endif @@ -59,7 +60,7 @@ int Curl_mbedtlsthreadlock_thread_setup(void)  #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)      if(pthread_mutex_init(&mutex_buf[i], NULL))        return 0; /* pthread_mutex_init failed */ -#elif defined(USE_THREADS_WIN32) +#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)      mutex_buf[i] = CreateMutex(0, FALSE, 0);      if(mutex_buf[i] == 0)        return 0;  /* CreateMutex failed */ @@ -80,7 +81,7 @@ int Curl_mbedtlsthreadlock_thread_cleanup(void)  #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)      if(pthread_mutex_destroy(&mutex_buf[i]))        return 0; /* pthread_mutex_destroy failed */ -#elif defined(USE_THREADS_WIN32) +#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)      if(!CloseHandle(mutex_buf[i]))        return 0; /* CloseHandle failed */  #endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */ @@ -100,7 +101,7 @@ int Curl_mbedtlsthreadlock_lock_function(int n)                       "Error: mbedtlsthreadlock_lock_function failed\n"));        return 0; /* pthread_mutex_lock failed */      } -#elif defined(USE_THREADS_WIN32) +#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)      if(WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED) {        DEBUGF(fprintf(stderr,                       "Error: mbedtlsthreadlock_lock_function failed\n")); @@ -120,7 +121,7 @@ int Curl_mbedtlsthreadlock_unlock_function(int n)                       "Error: mbedtlsthreadlock_unlock_function failed\n"));        return 0; /* pthread_mutex_unlock failed */      } -#elif defined(USE_THREADS_WIN32) +#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)      if(!ReleaseMutex(mutex_buf[n])) {        DEBUGF(fprintf(stderr,                       "Error: mbedtlsthreadlock_unlock_function failed\n")); | 
