]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
mbedtls: fix building with v3 in CMake Unity mode
authorViktor Szakats <commit@vsz.me>
Mon, 15 Apr 2024 18:39:15 +0000 (18:39 +0000)
committerViktor Szakats <commit@vsz.me>
Tue, 16 Apr 2024 07:36:43 +0000 (09:36 +0200)
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

lib/md4.c

index 58dd1166cf924f154dc957e0fde3ea637a0b9f0f..db0028135f58058751239d4812aa71323f6d2bb3 100644 (file)
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -55,7 +55,8 @@
 #else
 #include <mbedtls/config.h>
 #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 */