diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 14:27:24 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 14:27:24 +0000 |
| commit | ad6019d6c0d22f384838b2f9ca339bdabed331a5 (patch) | |
| tree | fd78efc15fcef7e62cee17ec664c1bf18564fd5e /crypto/mem.c | |
| parent | a27de7b7fde7c18e7e4f28c6aa2d9f06635d3f08 (diff) | |
Move locking and thread ID functions into new files lock.c and thr_id.c,
redirect locking to minimal FIPS_lock() function where required.
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index 6f80dd33eb..347c0d8184 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -101,7 +101,7 @@ static void (*free_locked_func)(void *) = free; /* may be changed as long as 'allow_customize_debug' is set */ /* XXX use correct function pointer types */ -#ifdef CRYPTO_MDEBUG +#if defined(CRYPTO_MDEBUG) && !defined(OPENSSL_FIPSCANISTER) /* use default functions from mem_dbg.c */ static void (*malloc_debug_func)(void *,int,const char *,int,int) = CRYPTO_dbg_malloc; |