aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc/impl/codegen/port_platform.h
diff options
context:
space:
mode:
authorGravatar Alexander Polcyn <apolcyn@google.com>2018-07-26 14:32:07 -0700
committerGravatar Alexander Polcyn <apolcyn@google.com>2018-07-26 14:32:07 -0700
commitf34c65393622878e9610939193fd9c754b7c0a74 (patch)
tree4cf189ac56f5de72b4be73204e908002d0dd4883 /include/grpc/impl/codegen/port_platform.h
parenta2bb308c8f1d32d02f8661a4780bdbea1aabcaf9 (diff)
Revert "Merge pull request #15797 from apolcyn/windows_compile_and_sort"
Diffstat (limited to 'include/grpc/impl/codegen/port_platform.h')
-rw-r--r--include/grpc/impl/codegen/port_platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h
index 2b61a8816d..01ce5f03e9 100644
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@@ -420,8 +420,12 @@ typedef unsigned __int64 uint64_t;
#define GPR_MAX_ALIGNMENT 16
#ifndef GRPC_ARES
+#ifdef GPR_WINDOWS
+#define GRPC_ARES 0
+#else
#define GRPC_ARES 1
#endif
+#endif
#ifndef GRPC_MUST_USE_RESULT
#if defined(__GNUC__) && !defined(__MINGW32__)