diff options
author | Mark D. Roth <roth@google.com> | 2016-09-12 11:54:25 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2016-09-12 11:54:25 -0700 |
commit | 242dc4be0e58a974f5f5852f498b0d55e0771887 (patch) | |
tree | 2f5e9b8be2ca79330556ff98dfc97ff155997b30 /vsprojects/vcxproj/grpc_test_util | |
parent | 58f52b789185d696d98be3c8ef4571499c8101dd (diff) | |
parent | ec5c93cabfbf535be2528df55ca8bb4500e6bc9b (diff) |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'vsprojects/vcxproj/grpc_test_util')
-rw-r--r-- | vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj | 3 | ||||
-rw-r--r-- | vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj index 1a74cf4b39..b6fdccb7a9 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj @@ -207,6 +207,7 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\httpcli.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\http\parser.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h" /> + <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair.h" /> <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\error.h" /> @@ -339,6 +340,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint_pair_posix.c"> diff --git a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters index ce5a1326dc..f6a223cd53 100644 --- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters @@ -100,6 +100,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.c"> <Filter>src\core\lib\iomgr</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.c"> + <Filter>src\core\lib\iomgr</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.c"> <Filter>src\core\lib\iomgr</Filter> </ClCompile> @@ -500,6 +503,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\closure.h"> <Filter>src\core\lib\iomgr</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\combiner.h"> + <Filter>src\core\lib\iomgr</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\lib\iomgr\endpoint.h"> <Filter>src\core\lib\iomgr</Filter> </ClInclude> |