diff options
| author |  apolcyn <apolcyn@google.com> | 2018-07-30 13:49:09 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-30 13:49:09 -0700 |
| commit | 8fc60d3f309ed53dddc4fcc911c880951a98e601 (patch) | |
| tree | aefb1ac001bdfd555d30512dd8066202fe5fa71b /include | |
| parent | a87b1fb3ef9859528f93d7792afaa121453d91c9 (diff) | |
| parent | 9896c641860a70e41b006a982e44f40bb3f41053 (diff) | |
Merge pull request #16163 from apolcyn/revert_revert_windows_breakage
Revert "Revert "Merge pull request #15797 from apolcyn/windows_compile_and_sort""
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 01ce5f03e9..2b61a8816d 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -420,12 +420,8 @@ 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__) |