Avoid AIX compiler issue by making the macro argument names not match any substring

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12767)

diff --git a/providers/baseprov.c b/providers/baseprov.c
index eb0e4afbd33c75acc419371657be8bdc5b67c3e1..dcea2ad93ee52013f2c106fca012f07778012cf9 100644 (file)
--- a/providers/baseprov.c
+++ b/providers/baseprov.c
@@ -65,9 +65,9 @@ static int base_get_params(void *provctx, OSSL_PARAM params[])
 }
 
 static const OSSL_ALGORITHM base_encoder[] = {
-#define ENCODER(name, fips, format, type, func_table)                           \
+#define ENCODER(name, _fips, _format, _type, func_table)                    \
     { name,                                                                 \
-      "provider=base,fips=" fips ",format=" format ",type=" type,           \
+      "provider=base,fips=" _fips ",format=" _format ",type=" _type,        \
       (func_table) }
 
 #include "encoders.inc"
@@ -76,9 +76,9 @@ static const OSSL_ALGORITHM base_encoder[] = {
 #undef ENCODER
 
 static const OSSL_ALGORITHM base_decoder[] = {
-#define DECODER(name, fips, input, func_table)                                \
+#define DECODER(name, _fips, _input, func_table)                            \
     { name,                                                                 \
-      "provider=base,fips=" fips ",input=" input,                           \
+      "provider=base,fips=" _fips ",input=" _input,                         \
       (func_table) }
 
 #include "decoders.inc"

diff --git a/providers/defltprov.c b/providers/defltprov.c
index 943bdc6136b190bb82f69bfa7e2d8574f0058139..855497be0673b562e6c62064e3ef49e6a09a4f26 100644 (file)
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -412,9 +412,9 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
 };
 
 static const OSSL_ALGORITHM deflt_encoder[] = {
-#define ENCODER(name, fips, format, type, func_table)                           \
+#define ENCODER(name, _fips, _format, _type, func_table)                    \
     { name,                                                                 \
-      "provider=default,fips=" fips ",format=" format ",type=" type,        \
+      "provider=default,fips=" _fips ",format=" _format ",type=" _type,     \
       (func_table) }
 
 #include "encoders.inc"
@@ -423,9 +423,9 @@ static const OSSL_ALGORITHM deflt_encoder[] = {
 #undef ENCODER
 
 static const OSSL_ALGORITHM deflt_decoder[] = {
-#define DECODER(name, fips, input, func_table)                                \
+#define DECODER(name, _fips, _input, func_table)                            \
     { name,                                                                 \
-      "provider=default,fips=" fips ",input=" input,                        \
+      "provider=default,fips=" _fips ",input=" _input,                      \
       (func_table) }
 
 #include "decoders.inc"