diff options
| author |  jtattermusch <jtattermusch@google.com> | 2014-12-11 14:18:58 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2014-12-11 15:11:44 -0800 |
| commit | 94204dda83b06c2ab654027b4c780a3417ab3eb0 (patch) | |
| tree | c0829e0a95c013549e4fdcb26e01690a3ed99855 | |
| parent | 718c3f75879ffa7cf11c58bd0fb7bd3fe28b1719 (diff) | |
Fix ipv6.c build breakage on Windows.
Change on 2014/12/11 by jtattermusch <jtattermusch@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81910401
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | build.json | 2 | ||||
| -rw-r--r-- | test/core/util/ipv6_posix.c (renamed from test/core/util/ipv6.c) | 5 | ||||
| -rw-r--r-- | vsprojects/vs2013/grpc_test_util.vcxproj | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -750,7 +750,7 @@ clean_libgrpc: LIBGRPC_TEST_UTIL_SRC = \ test/core/util/grpc_profiler.c \ - test/core/util/ipv6.c \ + test/core/util/ipv6_posix.c \ test/core/util/parse_hexstring.c \ test/core/util/port_posix.c \ test/core/util/slice_splitter.c \ diff --git a/build.json b/build.json index c395f10772..550f3af1a6 100644 --- a/build.json +++ b/build.json @@ -271,7 +271,7 @@ "vs_project_guid": "{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}", "src": [ "test/core/util/grpc_profiler.c", - "test/core/util/ipv6.c", + "test/core/util/ipv6_posix.c", "test/core/util/parse_hexstring.c", "test/core/util/port_posix.c", "test/core/util/slice_splitter.c", diff --git a/test/core/util/ipv6.c b/test/core/util/ipv6_posix.c index 80f6a0ec91..25758f59fe 100644 --- a/test/core/util/ipv6.c +++ b/test/core/util/ipv6_posix.c @@ -31,6 +31,9 @@ * */ +#include <grpc/support/port_platform.h> +#ifdef GPR_POSIX_SOCKET + #include "test/core/util/ipv6.h" #include <netinet/in.h> @@ -53,3 +56,5 @@ int grpc_ipv6_loopback_available() { } return ok; } + +#endif /* GPR_POSIX_SOCKET */ diff --git a/vsprojects/vs2013/grpc_test_util.vcxproj b/vsprojects/vs2013/grpc_test_util.vcxproj index 2c70619669..fa6f5b07ae 100644 --- a/vsprojects/vs2013/grpc_test_util.vcxproj +++ b/vsprojects/vs2013/grpc_test_util.vcxproj @@ -77,7 +77,7 @@ <ItemGroup> <ClCompile Include="..\..\test\core\util\grpc_profiler.c"> </ClCompile> - <ClCompile Include="..\..\test\core\util\ipv6.c"> + <ClCompile Include="..\..\test\core\util\ipv6_posix.c"> </ClCompile> <ClCompile Include="..\..\test\core\util\parse_hexstring.c"> </ClCompile> |