diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
| commit | 4386445c180179aa446a3f52b06f27c665169b97 (patch) | |
| tree | 8a6985f406a9449148ffbddac844117b679bccc5 /crypto/cryptlib.c | |
| parent | a585aa67507f8916f592e37b0fa8618e2bbbe08c (diff) | |
Change STRING to OPENSSL_STRING etc as common words such
as "STRING" cause conflicts with other headers/libraries.
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 4cda65f920..41be45d620 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -174,7 +174,7 @@ static const char* const lock_names[CRYPTO_NUM_LOCKS] = /* This is for applications to allocate new type names in the non-dynamic array of lock names. These are numbered with positive numbers. */ -static STACK_OF(STRING) *app_locks=NULL; +static STACK_OF(OPENSSL_STRING) *app_locks=NULL; /* For applications that want a more dynamic way of handling threads, the following stack is used. These are externally numbered with negative @@ -210,7 +210,7 @@ int CRYPTO_get_new_lockid(char *name) SSLeay_MSVC5_hack=(double)name[0]*(double)name[1]; #endif - if ((app_locks == NULL) && ((app_locks=sk_STRING_new_null()) == NULL)) + if ((app_locks == NULL) && ((app_locks=sk_OPENSSL_STRING_new_null()) == NULL)) { CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE); return(0); @@ -220,7 +220,7 @@ int CRYPTO_get_new_lockid(char *name) CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_LOCKID,ERR_R_MALLOC_FAILURE); return(0); } - i=sk_STRING_push(app_locks,str); + i=sk_OPENSSL_STRING_push(app_locks,str); if (!i) OPENSSL_free(str); else @@ -651,10 +651,10 @@ const char *CRYPTO_get_lock_name(int type) return("dynamic"); else if (type < CRYPTO_NUM_LOCKS) return(lock_names[type]); - else if (type-CRYPTO_NUM_LOCKS > sk_STRING_num(app_locks)) + else if (type-CRYPTO_NUM_LOCKS > sk_OPENSSL_STRING_num(app_locks)) return("ERROR"); else - return(sk_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); + return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); } #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ |