romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-03 19:14:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl/curl.h: revert to recursive macros to keep supporting C++ use-case

Browse source 
To avoid breaking 3rd-party code reusing these symbols as C++ methods,
e.g. in CMake sources:
```
cmake/src/v4.0.0-b30653ae0c.clean/Source/cmCurl.cxx:119:24: error: expected unqualified-id
  119 |     ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str());
      |                        ^
```

Also expand comment to highlight the case.

Reported-by: Kai Pastor
Bug: daa6b27b4d (r177869049)
Reported-by: Marcel Raad
Bug: https://curl.se/mail/lib-2026-02/0020.html
Fixes #20682
Follow-up to daa6b27b4d #20597

Closes #20686
This commit is contained in:
Viktor Szakats 2026-02-23 12:00:18 +01:00
parent d6d8a1a15a
commit ee9b000438
No known key found for this signature in database
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMake/PickyWarnings.cmake
View file

@ -161,7 +161,7 @@ if(PICKY_COMPILER)
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.1)
list(APPEND _picky_enable
-Wno-covered-switch-default # clang 3.1 appleclang 3.1 # Annoying to fix or silence
-Wno-disabled-macro-expansion # clang 3.1 appleclang 3.1 # Triggered by standard headers
-Wno-disabled-macro-expansion # clang 3.1 appleclang 3.1 # Triggered by curl/curl.h, standard headers
)
if(MSVC)
list(APPEND _picky_enable

13
include/curl/curl.h
View file

@ -3329,15 +3329,16 @@ CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle,
#if defined(__STDC__) && (__STDC__ >= 1)
/* This preprocessor magic that replaces a call with the exact same call is
only done to make sure application authors pass exactly three arguments
to these functions. */
to these functions. Use recursive macros to allow reusing these symbols
as C++ method names. */
#define curl_easy_setopt(handle, opt, param) \
(curl_easy_setopt)(handle, opt, param)
curl_easy_setopt(handle, opt, param)
#define curl_easy_getinfo(handle, info, arg) \
(curl_easy_getinfo)(handle, info, arg)
curl_easy_getinfo(handle, info, arg)
#define curl_share_setopt(share, opt, param) \
(curl_share_setopt)(share, opt, param)
#define curl_multi_setopt(handle,opt,param) \
(curl_multi_setopt)(handle, opt, param)
curl_share_setopt(share, opt, param)
#define curl_multi_setopt(handle, opt, param) \
curl_multi_setopt(handle, opt, param)
#endif /* __STDC__ >= 1 */
#endif /* gcc >= 4.3 && !__cplusplus && !CURL_DISABLE_TYPECHECK */

2
m4/curl-compilers.m4
View file

@ -868,7 +868,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
if test "$compiler_num" -ge "301"; then
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [format-non-iso])
tmp_CFLAGS="$tmp_CFLAGS -Wno-covered-switch-default" # Annoying to fix or silence
tmp_CFLAGS="$tmp_CFLAGS -Wno-disabled-macro-expansion" # Triggered by standard headers
tmp_CFLAGS="$tmp_CFLAGS -Wno-disabled-macro-expansion" # Triggered by curl/curl.h, standard headers
fi
#
dnl Only clang 3.2 or later