diff options
author | Yuchen Zeng <zyc@google.com> | 2017-02-27 13:35:41 -0800 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2017-03-17 15:57:23 -0700 |
commit | 2c977084c8fec4bc395976338683d1d480bab91e (patch) | |
tree | cf696a8403371b308a45d02445864159ba527e08 /include/grpc/impl/codegen/port_platform.h | |
parent | dc6b569d97aa54e987681f869f13acdd9c89834f (diff) | |
parent | dc720ca6bf27181c040cefcdb298d9dee8bf3058 (diff) |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'include/grpc/impl/codegen/port_platform.h')
-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 1c73aaab92..086394648f 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -297,6 +297,10 @@ #endif #ifdef _MSC_VER +#ifdef _PYTHON_MSVC +// The Python 3.5 Windows runtime is missing InetNtop +#define GPR_WIN_INET_NTOP +#endif // _PYTHON_MSVC #if _MSC_VER < 1700 typedef __int8 int8_t; typedef __int16 int16_t; |