diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-07-15 12:02:18 -0400 |
commit | c0391bae75e9eb71f5fa2ab24fc97792c204225d (patch) | |
tree | 9701969423b86fdc2ba04080338d817c3b5c9864 /src/common/torlog.h | |
parent | 2cb59be9993ecec13ceabc0c4754e52f8c5ea4e5 (diff) | |
parent | ec6c155f827000e337796f1f1c54299fbc5cf72a (diff) | |
download | tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.tar.gz tor-c0391bae75e9eb71f5fa2ab24fc97792c204225d.zip |
Merge remote-tracking branch 'public/fancy_test_tricks'
Conflicts:
src/common/include.am
Conflict was from adding testsupport.h near where sandbox.h had
already been added.
Diffstat (limited to 'src/common/torlog.h')
-rw-r--r-- | src/common/torlog.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/common/torlog.h b/src/common/torlog.h index 9b2ff2c9ff..ecd7e121eb 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -114,12 +114,6 @@ typedef struct log_severity_list_t { log_domain_mask_t masks[LOG_DEBUG-LOG_ERR+1]; } log_severity_list_t; -#ifdef LOG_PRIVATE -/** Given a severity, yields an index into log_severity_list_t.masks to use - * for that severity. */ -#define SEVERITY_MASK_IDX(sev) ((sev) - LOG_ERR) -#endif - /** Callback type used for add_callback_log. */ typedef void (*log_callback)(int severity, uint32_t domain, const char *msg); |