sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Nick Mathewson 2018-03-19 19:18:23 -04:00
parent d8893bc93c
commit 228b655935
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/torlog.h
View File

@ -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,