summaryrefslogtreecommitdiffstats
path: root/crypto/crypto.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>1999-12-18 02:34:37 +0000
committerRichard Levitte <levitte@openssl.org>1999-12-18 02:34:37 +0000
commitf3a2a0449613dfe7967bc9df646aff9767d0fd79 (patch)
tree336f8713dc085e4ec5dd5476f637ca379670e984 /crypto/crypto.h
parentd8df48a9bccb0f408b11af9a71abbf28a675839b (diff)
- Added more documentation in CHANGES.
- Made CRYPTO_MDEBUG even less used in crypto.h, giving MemCheck_start() and MemCheck_stop() only one possible definition. - Made the values of the debug function pointers in mem.c dependent on the existence of the CRYPTO_MDEBUG macro, and made the rest of the code understand the NULL case. That's it. With this code, the old behvior of the debug functionality is restored, but you can still opt to have it on, even when the library wasn't compiled with a defined CRYPTO_MDEBUG.
Diffstat (limited to 'crypto/crypto.h')
-rw-r--r--crypto/crypto.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 863b4e9224..19e8d10cbf 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -217,8 +217,8 @@ typedef struct crypto_ex_data_func_st
(void (*)())CRYPTO_dbg_realloc,\
(void (*)())CRYPTO_dbg_free,\
(void (*)())CRYPTO_dbg_set_options,\
- (void (*)())CRYPTO_dbg_get_options);\
- } while(0);
+ (int (*)())CRYPTO_dbg_get_options);\
+ } while(0)
#if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
@@ -226,13 +226,8 @@ typedef struct crypto_ex_data_func_st
# endif
#endif
-#ifdef CRYPTO_MDEBUG
#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
#define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-#else
-#define MemCheck_start()
-#define MemCheck_stop()
-#endif
#define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
#define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
#define is_MemCheck_on() CRYPTO_mem_check_on()