The branch master has been updated via ce43db7a3fcd18866385a4552f5e4a83adfc0979 (commit) from b7a8fb52a95d606e073a6f232262cc121659a1fe (commit)
- Log ----------------------------------------------------------------- commit ce43db7a3fcd18866385a4552f5e4a83adfc0979 Author: Jon Spillett <jon.spill...@oracle.com> Date: Tue Sep 8 10:33:28 2020 +1000 Fix up issue on AIX caused by broken compiler handling of macro expansion Reviewed-by: Tim Hudson <t...@openssl.org> Reviewed-by: Shane Lontis <shane.lon...@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12812) ----------------------------------------------------------------------- Summary of changes: providers/baseprov.c | 4 ++-- providers/defltprov.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/baseprov.c b/providers/baseprov.c index 38d9090bb3..e9502f68cd 100644 --- a/providers/baseprov.c +++ b/providers/baseprov.c @@ -87,8 +87,8 @@ static const OSSL_ALGORITHM base_decoder[] = { #undef DECODER static const OSSL_ALGORITHM base_store[] = { -#define STORE(name, fips, func_table) \ - { name, "provider=base,fips=" fips, (func_table) }, +#define STORE(name, _fips, func_table) \ + { name, "provider=base,fips=" _fips, (func_table) }, #include "stores.inc" { NULL, NULL, NULL } diff --git a/providers/defltprov.c b/providers/defltprov.c index beaf60bb1e..371d942f4a 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -434,8 +434,8 @@ static const OSSL_ALGORITHM deflt_decoder[] = { #undef DECODER static const OSSL_ALGORITHM deflt_store[] = { -#define STORE(name, fips, func_table) \ - { name, "provider=default,fips=" fips, (func_table) }, +#define STORE(name, _fips, func_table) \ + { name, "provider=default,fips=" _fips, (func_table) }, #include "stores.inc" { NULL, NULL, NULL }