X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=include%2Fopenssl%2Ftrace.h;h=df79478b783a0208060b5d443ddc23f7e0e7ab57;hp=59523c306d824dead1d4d5db6b843fe0f9931f76;hb=16a9d3746ef7e03207cc3cd290356613556959a5;hpb=682b444f8a78b8902a3521cd6486bdecb766e5e5

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index 59523c306d..df79478b78 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -173,19 +173,36 @@ void OSSL_trace_end(int category, BIO *channel);
  * call OSSL_TRACE_CANCEL(category).
  */
 
-# define OSSL_TRACE_BEGIN(category) \
+# ifndef OPENSSL_NO_TRACE
+
+#  define OSSL_TRACE_BEGIN(category) \
     do { \
         BIO *trc_out = OSSL_trace_begin(OSSL_TRACE_CATEGORY_##category); \
  \
         if (trc_out != NULL)
 
-# define OSSL_TRACE_END(category) \
+#  define OSSL_TRACE_END(category) \
         OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out); \
     } while (0)
 
-# define OSSL_TRACE_CANCEL(category) \
+#  define OSSL_TRACE_CANCEL(category) \
         OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out) \
 
+# else
+
+#  define OSSL_TRACE_BEGIN(category)           \
+    do {                                        \
+        BIO *trc_out = NULL;                    \
+        if (0)
+
+#  define OSSL_TRACE_END(category)             \
+    } while(0)
+
+#  define OSSL_TRACE_CANCEL(category)          \
+    ((void)0)
+
+# endif
+
 /*
  * OSSL_TRACE_ENABLED() - Check whether tracing is enabled for |category|
  *
@@ -195,10 +212,17 @@ void OSSL_trace_end(int category, BIO *channel);
  *         ...
  *     }
  */
+# ifndef OPENSSL_NO_TRACE
 
-# define OSSL_TRACE_ENABLED(category) \
+#  define OSSL_TRACE_ENABLED(category) \
     OSSL_trace_enabled(OSSL_TRACE_CATEGORY_##category)
 
+# else
+
+#  define OSSL_TRACE_ENABLED(category) (0)
+
+# endif
+
 /*
  * OSSL_TRACE*() - OneShot Trace Macros
  *