diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-11-29 10:25:37 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-11-29 10:25:37 +0000 |
| commit | 3822740ce361f6efb31f782596ad1510ea501895 (patch) | |
| tree | cbc487598c3c333432a1e14357dc998da5b433ff /crypto/engine | |
| parent | 0d78bc3356823b8145d5fb99c33db68a141f80dd (diff) | |
| download | openssl-3822740ce361f6efb31f782596ad1510ea501895.zip openssl-3822740ce361f6efb31f782596ad1510ea501895.tar.gz openssl-3822740ce361f6efb31f782596ad1510ea501895.tar.bz2 | |
We're getting a clash with C++ because it has a type called 'list'.
Therefore, change all instances of the symbol 'list' to something else.
PR: 758
Submitted by: Frédéric Giudicelli <groups@newpki.org>
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_fat.c | 6 | ||||
| -rw-r--r-- | crypto/engine/engine.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index a5ffbec..1539ea0 100644 --- 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); diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index 3a8753d..bcbec51 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -563,7 +563,7 @@ ENGINE *ENGINE_get_digest_engine(int nid); * structure will have had its reference count up'd so the caller * should still free their own reference 'e'. */ int ENGINE_set_default_RSA(ENGINE *e); -int ENGINE_set_default_string(ENGINE *e, const char *list); +int ENGINE_set_default_string(ENGINE *e, const char *def_list); /* Same for the other "methods" */ int ENGINE_set_default_DSA(ENGINE *e); int ENGINE_set_default_ECDH(ENGINE *e); |