From 924819ea7b3cfd61f66eb7454d44f4d1dca956ce Mon Sep 17 00:00:00 2001 From: Simon Butcher Date: Mon, 1 Oct 2018 14:05:25 +0100 Subject: [PATCH] Add check for multiple config files being defined Add check to check_config.h to ensure MBEDTLS_USER_CONFIG_FILE cannot be defined if MBEDTLS_CONFIG_FILE is defined. If both are defined MBEDTLS_USER_CONFIG_FILE will not be included, which may confuse users. --- include/mbedtls/check_config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index fa7110fe9..301b28323 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -30,6 +30,10 @@ #ifndef MBEDTLS_CHECK_CONFIG_H #define MBEDTLS_CHECK_CONFIG_H +#if defined(MBEDTLS_CONFIG_FILE) && defined(MBEDTLS_USER_CONFIG_FILE) +#error "MBEDTLS_USER_CONFIG_FILE cannot be included if MBEDTLS_CONFIG_FILE is defined." +#endif + /* * We assume CHAR_BIT is 8 in many places. In practice, this is true on our * target platforms, so not an issue, but let's just be extra sure.