commit 3480e77a205dcae32b1e3e48ed3b1fe6c81183a5
author Gilles Peskine <gilles.peskine@arm.com> Tue Aug 03 12:53:28 2021 +0200
committer GitHub <noreply@github.com> Tue Aug 03 12:53:28 2021 +0200
tree 1df56286432d48f2f5cc5084127dba35f13f3d4a
parent 9274d4691dba9ea176052b12cc958afcb6069d30
parent 30dc0b5386d5d5f9767f7dfbce6cd92d9120952f

Merge pull request #4829 from spencer-burke/fixing_4222-2.x

Backport of #4659

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index ce25bd0..396fe7d 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -509,10 +509,6 @@
 #error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_PLATFORM_STD_CALLOC) && !defined(MBEDTLS_PLATFORM_MEMORY)
-#error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites"
-#endif
-
 #if defined(MBEDTLS_PLATFORM_STD_FREE) && !defined(MBEDTLS_PLATFORM_MEMORY)
 #error "MBEDTLS_PLATFORM_STD_FREE defined, but not all prerequisites"
 #endif