summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-07-08 13:00:31 -0400
committerNick Mathewson <nickm@torproject.org>2019-07-08 13:00:31 -0400
commitd972f29d8df742d757eea9078fedaeed74cd0921 (patch)
tree8594ecbc9f6325d746af2cb55feeb0bd58140f7f
parent5e1660100027e742c39c073c84add64e093f7745 (diff)
downloadtor-d972f29d8df742d757eea9078fedaeed74cd0921.tar.gz
tor-d972f29d8df742d757eea9078fedaeed74cd0921.zip
Move declaration of LD_NO_MESG to make conflict more apparent.
-rw-r--r--src/lib/log/log.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/log/log.h b/src/lib/log/log.h
index 3db2169584..bd606ce900 100644
--- a/src/lib/log/log.h
+++ b/src/lib/log/log.h
@@ -118,6 +118,11 @@
#define LD_MESG (1u<<29)
#define N_LOGGING_DOMAINS 30
+#ifdef TOR_UNIT_TESTS
+/** This log message should not be intercepted by mock_saving_logv */
+#define LD_NO_MOCK (1u<<29)
+#endif
+
/** This log message is not safe to send to a callback-based logger
* immediately. Used as a flag, not a log domain. */
#define LD_NOCB (1u<<31)
@@ -125,11 +130,6 @@
* would. Used as a flag, not a log domain. */
#define LD_NOFUNCNAME (1u<<30)
-#ifdef TOR_UNIT_TESTS
-/** This log message should not be intercepted by mock_saving_logv */
-#define LD_NO_MOCK (1u<<29)
-#endif
-
/** Mask of zero or more log domains, OR'd together. */
typedef uint32_t log_domain_mask_t;