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

Backport of #4659
This commit is contained in:
Gilles Peskine 2021-08-03 12:53:28 +02:00 committed by GitHub
commit 3480e77a20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -509,10 +509,6 @@
#error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites" #error "MBEDTLS_PLATFORM_STD_CALLOC defined, but not all prerequisites"
#endif #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) #if defined(MBEDTLS_PLATFORM_STD_FREE) && !defined(MBEDTLS_PLATFORM_MEMORY)
#error "MBEDTLS_PLATFORM_STD_FREE defined, but not all prerequisites" #error "MBEDTLS_PLATFORM_STD_FREE defined, but not all prerequisites"
#endif #endif