diff options
| author |  Nicolas Noble <nnoble@google.com> | 2015-01-26 11:41:12 -0800 |
|---|---|---|
| committer | Nicolas Noble <nnoble@google.com> | 2015-01-26 11:41:12 -0800 |
| commit | fee065c1c7f01207c0e484c92681cea184b1983a (patch) | |
| tree | 11baf429fdee72a169bdb0b1d17f16154ab5186a /vsprojects/vs2013/grpc.vcxproj | |
| parent | 614c2bf99b1865761e5a05a56faf1ad8f26138ff (diff) | |
| parent | c41704bada0dc8974e7063f84dae934931813811 (diff) | |
Merge branch 'master' of github.com:google/grpc into json
Conflicts:
src/core/security/credentials.c
Diffstat (limited to 'vsprojects/vs2013/grpc.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 38192548a7..28ea60339d 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -121,7 +121,9 @@ <ClInclude Include="..\..\src\core\iomgr\pollset.h" /> <ClInclude Include="..\..\src\core\iomgr\pollset_kick.h" /> <ClInclude Include="..\..\src\core\iomgr\pollset_kick_posix.h" /> + <ClInclude Include="..\..\src\core\iomgr\pollset_kick_windows.h" /> <ClInclude Include="..\..\src\core\iomgr\pollset_posix.h" /> + <ClInclude Include="..\..\src\core\iomgr\pollset_windows.h" /> <ClInclude Include="..\..\src\core\iomgr\resolve_address.h" /> <ClInclude Include="..\..\src\core\iomgr\sockaddr.h" /> <ClInclude Include="..\..\src\core\iomgr\sockaddr_posix.h" /> @@ -254,7 +256,9 @@ </ClCompile> <ClCompile Include="..\..\src\core\iomgr\pollset_posix.c"> </ClCompile> - <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c"> + <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\resolve_address.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c"> </ClCompile> |