summaryrefslogtreecommitdiff
path: root/lib/libcrypto/bio/bss_bio.c
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2002-05-21 01:49:12 +0000
committerBob Beck <beck@cvs.openbsd.org>2002-05-21 01:49:12 +0000
commit9b2a9967579b0f80efba45c01bb80b222b8d45f2 (patch)
treeded50191de034a4f2909459a26179e9d81f42c1a /lib/libcrypto/bio/bss_bio.c
parent8d68b65a3eb5baf87a0f9ceccd66a839a1a81252 (diff)
Merge openssl-0.9.7-stable-SNAP-20020519
Diffstat (limited to 'lib/libcrypto/bio/bss_bio.c')
-rw-r--r--lib/libcrypto/bio/bss_bio.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c
index a5da4730317..1c485a4479a 100644
--- a/lib/libcrypto/bio/bss_bio.c
+++ b/lib/libcrypto/bio/bss_bio.c
@@ -7,9 +7,18 @@
* for which no specific BIO method is available.
* See ssl/ssltest.c for some hints on how this can be used. */
+/* BIO_DEBUG implies BIO_PAIR_DEBUG */
+#ifdef BIO_DEBUG
+# ifndef BIO_PAIR_DEBUG
+# define BIO_PAIR_DEBUG
+# endif
+#endif
+
+/* disable assert() unless BIO_PAIR_DEBUG has been defined */
#ifndef BIO_PAIR_DEBUG
-# undef NDEBUG /* avoid conflicting definitions */
-# define NDEBUG
+# ifndef NDEBUG
+# define NDEBUG
+# endif
#endif
#include <assert.h>