diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-03-12 11:40:48 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-03-12 11:40:48 -0500 |
commit | 444233c15ec34b78bba0b03547f0ae70b8e2b918 (patch) | |
tree | 934196084833755c33879b4c04faf1eaa6b1bc1d /src/app | |
parent | b5d08ddc09ec785d81e4043d9f9e2f032c9e49ab (diff) | |
download | tor-444233c15ec34b78bba0b03547f0ae70b8e2b918.tar.gz tor-444233c15ec34b78bba0b03547f0ae70b8e2b918.zip |
Run "make autostyle" in advance of new series.
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/config/config.c | 4 | ||||
-rw-r--r-- | src/app/config/resolve_addr.c | 2 | ||||
-rw-r--r-- | src/app/config/resolve_addr.h | 4 | ||||
-rw-r--r-- | src/app/main/main.c | 4 | ||||
-rw-r--r-- | src/app/main/risky_options.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index fa976d911d..f9f09dcd63 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4958,9 +4958,9 @@ options_init_logs(const or_options_t *old_options, const or_options_t *options, if (!validate_only) { add_syslog_log(severity, options->SyslogIdentityTag); } -#else +#else /* !defined(HAVE_SYSLOG_H) */ log_warn(LD_CONFIG, "The android logging API is no longer supported."); -#endif +#endif /* defined(HAVE_SYSLOG_H) */ goto cleanup; } } diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 5e096f328f..43a3eb39de 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -852,4 +852,4 @@ resolve_addr_reset_suggested(int family) tor_addr_make_unspec(&last_suggested_addrs[af_to_idx(family)]); } -#endif /* TOR_UNIT_TESTS */ +#endif /* defined(TOR_UNIT_TESTS) */ diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h index 9c9fee50a6..9a3846dfcb 100644 --- a/src/app/config/resolve_addr.h +++ b/src/app/config/resolve_addr.h @@ -61,7 +61,7 @@ void resolve_addr_reset_suggested(int family); #endif /* TOR_UNIT_TESTS */ -#endif /* RESOLVE_ADDR_PRIVATE */ +#endif /* defined(RESOLVE_ADDR_PRIVATE) */ -#endif /* TOR_CONFIG_RESOLVE_ADDR_H */ +#endif /* !defined(TOR_CONFIG_RESOLVE_ADDR_H) */ diff --git a/src/app/main/main.c b/src/app/main/main.c index 5417bbd486..c113e0183d 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -309,7 +309,7 @@ process_win32_console_ctrl(DWORD ctrl_type) activate_signal(SIGINT); return TRUE; } -#endif +#endif /* defined(_WIN32) */ /** * Write current memory usage information to the log. @@ -514,7 +514,7 @@ handle_signals(void) * to handle control signals like Ctrl+C in the console, we can use this to * simulate the SIGINT signal */ if (enabled) SetConsoleCtrlHandler(process_win32_console_ctrl, TRUE); -#endif +#endif /* defined(_WIN32) */ } /* Cause the signal handler for signal_num to be called in the event loop. */ diff --git a/src/app/main/risky_options.h b/src/app/main/risky_options.h index 244c1f5715..f94dd15faa 100644 --- a/src/app/main/risky_options.h +++ b/src/app/main/risky_options.h @@ -14,4 +14,4 @@ extern const char risky_option_list[]; -#endif +#endif /* !defined(TOR_RISKY_OPTIONS_H) */ |