]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Move LOG_PROTOCOL_WARN to app/config.h
authorteor <teor@torproject.org>
Tue, 31 Mar 2020 23:14:47 +0000 (09:14 +1000)
committerteor <teor@torproject.org>
Tue, 31 Mar 2020 23:17:18 +0000 (09:17 +1000)
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
src/core/or/or.h

index 04d877e9dade1e72a51eb5b030f392950330bea4..f2408bc4f9eda730e1ef7574c346815aa6a9a43a 100644 (file)
@@ -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,
index 488a0fb09c3eb630620f19430bc40aadd642bcf2..5b35cbe7f1e96a6d89bb7d49a67f073462f1aaae 100644 (file)
@@ -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