diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-10-02 17:42:41 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-10-02 19:01:25 -0700 |
| commit | bc460fa3c41ead4323c6fcb42f1a76c9cbef9b14 (patch) | |
| tree | ba76aaf9bfb3023ba8178fe833090843a8dad535 /src/core/lib/iomgr/socket_utils_windows.cc | |
| parent | c7eaff15c0004d1dbd3c635cae222dd3d609c165 (diff) | |
Rebasing on master for easier merging and testing
Diffstat (limited to 'src/core/lib/iomgr/socket_utils_windows.cc')
| -rw-r--r-- | src/core/lib/iomgr/socket_utils_windows.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/socket_utils_windows.cc b/src/core/lib/iomgr/socket_utils_windows.cc index 2732c159aa..6e85e4b61f 100644 --- a/src/core/lib/iomgr/socket_utils_windows.cc +++ b/src/core/lib/iomgr/socket_utils_windows.cc @@ -26,12 +26,8 @@ #include <grpc/support/log.h> const char *grpc_inet_ntop(int af, const void *src, char *dst, size_t size) { -#ifdef GPR_WIN_INET_NTOP - return inet_ntop(af, src, dst, size); -#else /* Windows InetNtopA wants a mutable ip pointer */ return InetNtopA(af, (void *)src, dst, size); -#endif /* GPR_WIN_INET_NTOP */ } #endif /* GRPC_WINDOWS_SOCKETUTILS */ |