commit 228b65593533a796243853f53109049ebc2b4efa Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 19 19:18:23 2018 -0400
Move rust-specific declarations outside of #else block
These declarations need to exist unconditionally, but they were trapped inside an "#else /* !(defined(HAVE_SYSLOG_H)) */" block.
Fixes a travis regression caused by 23881; bug not in any released tor. --- src/common/torlog.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/common/torlog.h b/src/common/torlog.h index a8b5604d8..ac632ff52 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -31,16 +31,6 @@ * "maximum severity" read "most severe" and "numerically *lowest* severity". */
-/** This defines log levels that are linked in the Rust log module, rather - * than re-defining these in both Rust and C. - * - * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain - */ -extern const int LOG_WARN_; -extern const int LOG_NOTICE_; -extern const log_domain_mask_t LD_NET_; -extern const log_domain_mask_t LD_GENERAL_; - /** Debug-level severity: for hyper-verbose messages of no interest to * anybody but developers. */ #define LOG_DEBUG 7 @@ -262,6 +252,16 @@ void tor_log_string(int severity, log_domain_mask_t domain, args, ##__VA_ARGS__) #endif /* defined(__GNUC__) && __GNUC__ <= 3 */
+/** This defines log levels that are linked in the Rust log module, rather + * than re-defining these in both Rust and C. + * + * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain + */ +extern const int LOG_WARN_; +extern const int LOG_NOTICE_; +extern const log_domain_mask_t LD_NET_; +extern const log_domain_mask_t LD_GENERAL_; + #ifdef LOG_PRIVATE MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format,