summaryrefslogtreecommitdiff
path: root/crypto/mem_dbg.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>1999-12-18 01:14:39 +0000
committerRichard Levitte <levitte@openssl.org>1999-12-18 01:14:39 +0000
commitd8df48a9bccb0f408b11af9a71abbf28a675839b (patch)
tree333d174708315a67f10d543d789c334e19bf0588 /crypto/mem_dbg.c
parent78bf1920a2fb7a4d5f222ffbd16e598e3a6c54b8 (diff)
downloadopenssl-new-d8df48a9bccb0f408b11af9a71abbf28a675839b.tar.gz
- Made sure some changed behavior is documented in CHANGES.
- Moved the handling of compile-time defaults from crypto.h to mem_dbg.c, since it doesn't make sense for the library users to try to affect this without recompiling libcrypto. - Made sure V_CRYPTO_MDEBUG_TIME and V_CRYPTO_MDEBUG_THREAD had clear and constant definitions. - Aesthetic correction.
Diffstat (limited to 'crypto/mem_dbg.c')
-rw-r--r--crypto/mem_dbg.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 3465ec21d9..4bddbe07b2 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -106,7 +106,29 @@ typedef struct mem_st
APP_INFO *app_info;
} MEM;
-static int options = V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD;
+
+#ifdef CRYPTO_MDEBUG_ALL
+# ifndef CRYPTO_MDEBUG_TIME
+# define CRYPTO_MDEBUG_TIME
+# endif
+# ifndef CRYPTO_MDEBUG_THREAD
+# define CRYPTO_MDEBUG_THREAD
+# endif
+#endif
+
+/* Get defaults that will depend on some macros defined elsewhere */
+#ifdef CRYPTO_MDEBUG_TIME
+#define DEF_V_CRYPTO_MDEBUG_TIME V_CRYPTO_MDEBUG_TIME
+#else
+#define DEF_V_CRYPTO_MDEBUG_TIME 0
+#endif
+#ifdef CRYPTO_MDEBUG_THREAD
+#define DEF_V_CRYPTO_MDEBUG_THREAD V_CRYPTO_MDEBUG_THREAD
+#else
+#define DEF_V_CRYPTO_MDEBUG_THREAD 0
+#endif
+
+static int options = DEF_V_CRYPTO_MDEBUG_TIME | DEF_V_CRYPTO_MDEBUG_THREAD;
int CRYPTO_mem_ctrl(int mode)