diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-17 17:04:47 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-17 17:04:47 -0500 |
| commit | 3ba84717a0ac76785935efcca50ab80e1e2f5564 (patch) | |
| tree | 21d4a0fc727df2c3af38f739057076bdbea1ba3a /crypto | |
| parent | 4277cf909103efff5773fdfa072f05dccb769c5b (diff) | |
| download | openssl-3ba84717a0ac76785935efcca50ab80e1e2f5564.tar.gz | |
Finish 02f7114a7fbb3f3ac171bae87be8c13bc69e4005
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/engine/eng_int.h | 4 | ||||
| -rw-r--r-- | crypto/lock.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h index 8122922717..0eee21163a 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_int.h @@ -86,7 +86,7 @@ extern "C" { (unsigned int)(e), (isfunct ? "funct" : "struct"), \ ((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \ ((isfunct) ? (e)->funct_ref : (e)->struct_ref), \ - (__FILE__), (__LINE__)) + (OPENSSL_FILE), (OPENSSL_LINE)) # else @@ -134,7 +134,7 @@ ENGINE *engine_table_select(ENGINE_TABLE **table, int nid); # else ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f, int l); -# define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__) +# define engine_table_select(t,n) engine_table_select_tmp(t,n,OPENSSL_FILE,OPENSSL_LINE) # endif typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg); diff --git a/crypto/lock.c b/crypto/lock.c index 9be78c4ed8..5a42dc9094 100644 --- a/crypto/lock.c +++ b/crypto/lock.c @@ -255,7 +255,7 @@ int CRYPTO_get_new_dynlockid(void) return (0); } pointer->references = 1; - pointer->data = dynlock_create_callback(__FILE__, __LINE__); + pointer->data = dynlock_create_callback(OPENSSL_FILE, OPENSSL_LINE); if (pointer->data == NULL) { OPENSSL_free(pointer); CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE); @@ -281,7 +281,7 @@ int CRYPTO_get_new_dynlockid(void) CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); if (i == -1) { - dynlock_destroy_callback(pointer->data, __FILE__, __LINE__); + dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE); OPENSSL_free(pointer); } else i += 1; /* to avoid 0 */ @@ -319,7 +319,7 @@ void CRYPTO_destroy_dynlockid(int i) CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK); if (pointer) { - dynlock_destroy_callback(pointer->data, __FILE__, __LINE__); + dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE); OPENSSL_free(pointer); } } |