diff options
author | Jon Spillett <jon.spillett@oracle.com> | 2020-09-08 10:33:28 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-09 19:08:59 +1000 |
commit | ce43db7a3fcd18866385a4552f5e4a83adfc0979 (patch) | |
tree | 2f78b0dc463289b3f67a4e98397e39e86fc3cd64 /providers | |
parent | b7a8fb52a95d606e073a6f232262cc121659a1fe (diff) |
Fix up issue on AIX caused by broken compiler handling of macro expansion
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12812)
Diffstat (limited to 'providers')
-rw-r--r-- | providers/baseprov.c | 4 | ||||
-rw-r--r-- | 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 } |