mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
b563a92cd6
This patch aims to cleanup the use of `process.h` header and the macro `HAVE_PROCESS_H` associated with it. - `process.h` is always available on Windows. In curl, it is required only for `_beginthreadex()` in `lib/curl_threads.c`. - `process.h` is also available in MS-DOS. In curl, its only use was in `lib/smb.c` for `getpid()`. But `getpid()` is in fact declared by `unistd.h`, which is always enabled via `lib/config-dos.h`. So the header is not necessary. - `HAVE_PROCESS_H` was detected by CMake, forced to 1 on Windows and left to real detection for other platforms. It was also set to always-on in `lib/config-win32.h` and `lib/config-dos.h`. In autotools builds, there was no detection and the macro was never set. Based on these observations, in this patch we: - Rework Windows `getpid` logic in `lib/smb.c` to always use the equivalent direct Win32 API function `GetCurrentProcessId()`, as we already did for Windows UWP apps. This makes `process.h` unnecessary here on Windows. - Stop #including `process.h` into files where it was not necessary. This is everywhere, except `lib/curl_threads.c`. > Strangely enough, `lib/curl_threads.c` compiled fine with autotools > because `process.h` is also indirecty included via `unistd.h`. This > might have been broken in autotools MSVC builds, where the latter > header is missing. - Delete all remaining `HAVE_PROCESS_H` feature guards, for they were unnecessary. - Delete `HAVE_PROCESS_H` detection from CMake and predefined values from `lib/config-*.h` headers. Reviewed-by: Jay Satiro Closes #9703
51 lines
1.8 KiB
C
51 lines
1.8 KiB
C
#ifndef HEADER_CURL_MBEDTLS_THREADLOCK_H
|
|
#define HEADER_CURL_MBEDTLS_THREADLOCK_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2013 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
* Copyright (C) 2010, Hoi-Ho Chan, <hoiho.chan@gmail.com>
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef USE_MBEDTLS
|
|
|
|
#if (defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
|
|
defined(USE_THREADS_WIN32)
|
|
|
|
int Curl_mbedtlsthreadlock_thread_setup(void);
|
|
int Curl_mbedtlsthreadlock_thread_cleanup(void);
|
|
int Curl_mbedtlsthreadlock_lock_function(int n);
|
|
int Curl_mbedtlsthreadlock_unlock_function(int n);
|
|
|
|
#else
|
|
|
|
#define Curl_mbedtlsthreadlock_thread_setup() 1
|
|
#define Curl_mbedtlsthreadlock_thread_cleanup() 1
|
|
#define Curl_mbedtlsthreadlock_lock_function(x) 1
|
|
#define Curl_mbedtlsthreadlock_unlock_function(x) 1
|
|
|
|
#endif /* USE_THREADS_POSIX || USE_THREADS_WIN32 */
|
|
|
|
#endif /* USE_MBEDTLS */
|
|
|
|
#endif /* HEADER_CURL_MBEDTLS_THREADLOCK_H */
|