From: Viktor Szakats Date: Mon, 15 Apr 2024 18:39:15 +0000 (+0000) Subject: mbedtls: fix building with v3 in CMake Unity mode X-Git-Tag: curl-8_8_0~223 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3774b8a9a7670f8ed9fd05781c708bc94339835f;p=thirdparty%2Fcurl.git mbedtls: fix building with v3 in CMake Unity mode Before this patch the internal feature detection macro `HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS` was defined in three files, with an incomplete logic in one of them. In Unity mode that spilled into another source file and broke the build. Closes #13377 --- diff --git a/lib/md4.c b/lib/md4.c index 58dd1166cf..db0028135f 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -55,7 +55,8 @@ #else #include #endif -#if(MBEDTLS_VERSION_NUMBER >= 0x02070000) +#if(MBEDTLS_VERSION_NUMBER >= 0x02070000) && \ + (MBEDTLS_VERSION_NUMBER < 0x03000000) #define HAS_MBEDTLS_RESULT_CODE_BASED_FUNCTIONS #endif #endif /* USE_MBEDTLS */