diff options
| author |  apolcyn <apolcyn@google.com> | 2018-07-26 16:46:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-26 16:46:04 -0700 |
| commit | d9e8f86675cf923714b3ead4b06087e14a88c08c (patch) | |
| tree | 7af94ceba16ce78dedd27de9c81f5b71aee73010 /include/grpc/impl/codegen | |
| parent | 04847aeb1e62bc528d88fa3c47daa24a4cf629b3 (diff) | |
| parent | f34c65393622878e9610939193fd9c754b7c0a74 (diff) | |
Merge pull request #16158 from apolcyn/revert_windows_breakage
Revert "Merge pull request #15797 from apolcyn/windows_compile_and_sort"
Diffstat (limited to 'include/grpc/impl/codegen')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 4 |
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__) |