diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 13:06:26 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 13:06:26 -0700 |
| commit | 34dac9d4ca3c0eeccfe7b797b0390bac7d2a8e7c (patch) | |
| tree | 1e96fe9d84dd33b789cfa51c42bb2edfbec8bd5e /vsprojects/vcxproj/grpc++_unsecure | |
| parent | abf03aed93e95c934143bcb986add21ed8ca239f (diff) | |
| parent | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
Diffstat (limited to 'vsprojects/vcxproj/grpc++_unsecure')
| -rw-r--r-- | vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj | 3 | ||||
| -rw-r--r-- | vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj index def1a9cc51..e712c48fff 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -383,6 +383,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" /> @@ -537,6 +538,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++_unsecure/grpc++_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters index 12a560630f..b2ccc64003 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters @@ -133,6 +133,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> @@ -731,6 +734,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> |