commit d972f29d8df742d757eea9078fedaeed74cd0921 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 8 13:00:31 2019 -0400

Move declaration of LD_NO_MESG to make conflict more apparent. --- src/lib/log/log.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 3db216958..bd606ce90 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;