tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE

commit d972f29d8df742d757eea9078fedaeed74cd0921
parent 5e1660100027e742c39c073c84add64e093f7745
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  8 Jul 2019 13:00:31 -0400

Move declaration of LD_NO_MESG to make conflict more apparent.

Diffstat:
Msrc/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 @@ -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;