Trying another fix for windows python

reviewable/pr12692/r4
Yash Tibrewal 8 years ago
parent 7f25686dcf
commit 778d244057
  1. 2
      setup.py
  2. 2
      src/core/lib/iomgr/socket_utils_windows.cc

@ -100,7 +100,7 @@ EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None)
EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None)
if EXTRA_ENV_COMPILE_ARGS is None:
EXTRA_ENV_COMPILE_ARGS = ''
if 'win32' in sys.platform: #and sys.version_info < (3, 5):
if 'win32' in sys.platform and sys.version_info < (3, 5):
EXTRA_ENV_COMPILE_ARGS += ' -std=c++11'
# We use define flags here and don't directly add to DEFINE_MACROS below to
# ensure that the expert user/builder has a way of turning it off (via the

@ -27,7 +27,7 @@
const char *grpc_inet_ntop(int af, const void *src, char *dst, size_t size) {
/* Windows InetNtopA wants a mutable ip pointer */
return InetNtopA(af, (void *)src, dst, size);
return InetNtop(af, (void *)src, dst, size);
}
#endif /* GRPC_WINDOWS_SOCKETUTILS */

Loading…
Cancel
Save