commit f863954f1e4d52fa6b73521e878a7140fe06c257 Author: teor teor@torproject.org Date: Wed Apr 1 09:14:47 2020 +1000
Move LOG_PROTOCOL_WARN to app/config.h
LOG_PROTOCOL_WARN was in core/or.h, but the function it depends on is in app/config.h. Put them in the same header, to reduce dependencies.
Part of 33633. --- src/app/config/config.h | 2 ++ src/core/or/or.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/config/config.h b/src/app/config/config.h index 04d877e9d..f2408bc4f 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -42,6 +42,8 @@ const char *escaped_safe_str(const char *address); void init_protocol_warning_severity_level(void); int get_protocol_warning_severity_level(void);
+#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) + /** An error from options_trial_assign() or options_init_from_string(). */ typedef enum setopt_err_t { SETOPT_OK = 0, diff --git a/src/core/or/or.h b/src/core/or/or.h index 488a0fb09..5b35cbe7f 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -995,8 +995,6 @@ typedef struct routerset_t routerset_t;
typedef struct or_options_t or_options_t;
-#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) - typedef struct or_state_t or_state_t;
#define MAX_SOCKS_ADDR_LEN 256