diff --git a/src/core/lib/gpr/posix/sync.cc b/src/core/lib/gpr/posix/sync.cc index c3cf035ba4d..d3a3dbcbb15 100644 --- a/src/core/lib/gpr/posix/sync.cc +++ b/src/core/lib/gpr/posix/sync.cc @@ -155,5 +155,5 @@ void gpr_once_init(gpr_once* once, void (*init_function)(void)) { GPR_ASSERT(pthread_once(once, init_function) == 0); } -#endif // defined(GPR_POSIX_SYNC) && !defined(GPR_ABSEIL_SYNC) && \ +#endif // defined(GPR_POSIX_SYNC) && !defined(GPR_ABSEIL_SYNC) && // !defined(GPR_CUSTOM_SYNC) diff --git a/src/core/lib/gpr/windows/sync.cc b/src/core/lib/gpr/windows/sync.cc index f06c73efb04..a08e26b7240 100644 --- a/src/core/lib/gpr/windows/sync.cc +++ b/src/core/lib/gpr/windows/sync.cc @@ -118,5 +118,5 @@ void gpr_once_init(gpr_once* once, void (*init_function)(void)) { InitOnceExecuteOnce(once, run_once_func, &arg, &phony); } -#endif // defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \ +#endif // defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && // !defined(GPR_CUSTOM_SYNC) diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc b/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc index fe1ada03592..fdc738630f1 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc +++ b/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc @@ -39,5 +39,5 @@ uint32_t grpc_if_nametoindex(char* name) { return out; } -#endif // GRPC_IF_NAMETOINDEX == 1 && \ +#endif // GRPC_IF_NAMETOINDEX == 1 && // defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX) diff --git a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc b/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc index 5555cad6d1b..d95efa50470 100644 --- a/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc +++ b/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc @@ -35,5 +35,5 @@ uint32_t grpc_if_nametoindex(char* name) { return 0; } -#endif // GRPC_IF_NAMETOINDEX == 0 || \ +#endif // GRPC_IF_NAMETOINDEX == 0 || // !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX) diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc index ad58ccd394f..a62b9daa1d1 100644 --- a/test/core/security/credentials_test.cc +++ b/test/core/security/credentials_test.cc @@ -1944,7 +1944,7 @@ TEST(CredentialsTest, TestGetWellKnownGoogleCredentialsFilePath) { // so we set it to some fake value restore_home_env = true; SetEnv("HOME", "/fake/home/for/bazel"); -#endif // defined(GRPC_BAZEL_BUILD) && (defined(GPR_POSIX_ENV) || \ +#endif // defined(GRPC_BAZEL_BUILD) && (defined(GPR_POSIX_ENV) || // defined(GPR_LINUX_ENV)) std::string path = grpc_get_well_known_google_credentials_file_path(); GPR_ASSERT(!path.empty());