mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2024-12-29 09:21:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix query_config macro expansion for windows

Browse Source
This commit is contained in:
Andres Amaya Garcia 2018-12-05 10:47:31 +00:00
parent 5bc6e92b70
commit 27b3372c45
3 changed files with 309 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

601
programs/ssl/query_config.c
View File

File diff suppressed because it is too large Load Diff

13
scripts/data_files/query_config.fmt
View File

@ -106,13 +106,14 @@
#include <string.h>
/* Helper macros to convert a macro or its expansion into a string */
#if defined(_MSC_VER)
#define MACRO_EXPANSION_TO_STR(macro) strlen( #macro ) > 0 ? #macro "\n" : ""
#else
/*
* Helper macros to convert a macro or its expansion into a string
* WARNING: This does not work for expanding function-like macros. However,
* Mbed TLS does not currently have configuration options used in this fashion.
*/
#define MACRO_EXPANSION_TO_STR(macro) MACRO_NAME_TO_STR(macro)
#define MACRO_NAME_TO_STR(macro) strlen( #macro ) > 0 ? #macro "\n" : ""
#endif /* _MSC_VER */
#define MACRO_NAME_TO_STR(macro) \
mbedtls_printf( "%s", strlen( #macro "" ) > 0 ? #macro "\n" : "" )
int query_config( const char *config )
{

2
scripts/generate_query_config.pl
View File

@ -39,7 +39,7 @@ while (my $line = <CONFIG_FILE>) {
$config_check .= "#if defined($name)\n";
$config_check .= " if( strcmp( \"$name\", config ) == 0 )\n";
$config_check .= " {\n";
$config_check .= " mbedtls_printf( \"%s\", MACRO_EXPANSION_TO_STR( $name ) );\n";
$config_check .= " MACRO_EXPANSION_TO_STR( $name );\n";
$config_check .= " return( 0 );\n";
$config_check .= " }\n";
$config_check .= "#endif /* $name */\n";