commit c8859eb7548f7173dfe98159abd6fd119d60ce94 Author: Neel Chauhan neel@neelc.org Date: Fri Nov 15 15:05:16 2019 -0500
Remove the extra whitespace around the DARWIN #defines --- src/app/config/config.c | 4 ++-- src/test/test_options.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c index c121775c0..3605cbd9f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3228,13 +3228,13 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) if (!strcasecmp(options->TransProxyType, "default")) { options->TransProxyType_parsed = TPT_DEFAULT; } else if (!strcasecmp(options->TransProxyType, "pf-divert")) { -#if !defined(OpenBSD) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined(DARWIN) /* Later versions of OS X have pf */ REJECT("pf-divert is a OpenBSD-specific " "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_PF_DIVERT; -#endif /* !defined(OpenBSD) && !defined( DARWIN ) */ +#endif /* !defined(OpenBSD) && !defined(DARWIN) */ } else if (!strcasecmp(options->TransProxyType, "tproxy")) { #if !defined(__linux__) REJECT("TPROXY is a Linux-specific feature."); diff --git a/src/test/test_options.c b/src/test/test_options.c index 8aa4bf090..e3b86c81a 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1071,14 +1071,14 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, -1);
-#if !defined(OpenBSD) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined(DARWIN) tt_str_op(msg, OP_EQ, "pf-divert is a OpenBSD-specific and OS X/Darwin-specific feature."); #else tt_int_op(tdata->opt->TransProxyType_parsed, OP_EQ, TPT_PF_DIVERT); tt_str_op(msg, OP_EQ, "Cannot use TransProxyType without " "any valid TransPort."); -#endif /* !defined(OpenBSD) && !defined( DARWIN ) */ +#endif /* !defined(OpenBSD) && !defined(DARWIN) */ tor_free(msg);
// Test tproxy trans proxy