ee9b000438
Viktor Szakats
2026-02-23
Subject
curl/curl.h: revert to recursive macros to keep supporting C++ use-case
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
CMake/PickyWarnings.cmake+1 -1
| @@ -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 | |
include/curl/curl.h+7 -6
| @@ -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 */ | |
m4/curl-compilers.m4+1 -1
| @@ -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 | |