From ce43db7a3fcd18866385a4552f5e4a83adfc0979 Mon Sep 17 00:00:00 2001 From: Jon Spillett Date: Tue, 8 Sep 2020 10:33:28 +1000 Subject: [PATCH] Fix up issue on AIX caused by broken compiler handling of macro expansion Reviewed-by: Tim Hudson Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/12812) --- 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 38d9090bb34..e9502f68cd2 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 beaf60bb1e6..371d942f4a7 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 } -- 2.47.2