We're getting a clash with C++ because it has a type called 'list'.

[openssl.git] / crypto / engine / eng_fat.c

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index a5ffbec94cdf78d365d1830ea09067f0a29c3d3b..1539ea039f741ef7c420a639e30b6bc66febe7f6 100644 (file)
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -124,14 +124,14 @@ static int int_def_cb(const char *alg, int len, void *arg)
        }
 
 
-int ENGINE_set_default_string(ENGINE *e, const char *list)
+int ENGINE_set_default_string(ENGINE *e, const char *def_list)
        {
        unsigned int flags = 0;
-       if (!CONF_parse_list(list, ',', 1, int_def_cb, &flags))
+       if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags))
                {
                ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_STRING,
                                        ENGINE_R_INVALID_STRING);
-               ERR_add_error_data(2, "str=",list);
+               ERR_add_error_data(2, "str=",def_list);
                return 0;
                }
        return ENGINE_set_default(e, flags);