diff options
| author |  Nicolas Noble <nnoble@google.com> | 2015-01-27 19:14:11 -0800 |
|---|---|---|
| committer | Nicolas Noble <nnoble@google.com> | 2015-01-27 19:14:11 -0800 |
| commit | 9574132019af3a04f25713722239e0667f17c90c (patch) | |
| tree | a2a386c6b0b28c2d1cf6e19616cf9c1776aff794 /vsprojects/vs2013/grpc.vcxproj | |
| parent | 66b5bba25bbfa5b13f527846ee35e18334e5e4ed (diff) | |
| parent | f6f3ea91996a30e28cca35391b4d47851b79a21c (diff) | |
Merge branch 'master' of github.com:google/grpc into json
Conflicts:
Makefile
build.json
vsprojects/vs2013/grpc.vcxproj
vsprojects/vs2013/grpc.vcxproj.filters
vsprojects/vs2013/grpc_unsecure.vcxproj
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'vsprojects/vs2013/grpc.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index d325121d70..8756bbf0ec 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -134,6 +134,8 @@ <ClInclude Include="..\..\src\core\iomgr\tcp_posix.h" /> <ClInclude Include="..\..\src\core\iomgr\tcp_server.h" /> <ClInclude Include="..\..\src\core\iomgr\time_averaged_stats.h" /> + <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_posix.h" /> + <ClInclude Include="..\..\src\core\iomgr\wakeup_fd_pipe.h" /> <ClInclude Include="..\..\src\core\json\json.h" /> <ClInclude Include="..\..\src\core\json\json_common.h" /> <ClInclude Include="..\..\src\core\json\json_reader.h" /> @@ -254,7 +256,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\iomgr\iomgr_posix.c"> </ClCompile> - <ClCompile Include="..\..\src\core\iomgr\pollset_kick_posix.c"> + <ClCompile Include="..\..\src\core\iomgr\pollset_kick.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\pollset_multipoller_with_poll_posix.c"> </ClCompile> @@ -280,6 +282,14 @@ </ClCompile> <ClCompile Include="..\..\src\core\iomgr\time_averaged_stats.c"> </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\wakeup_fd_eventfd.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\wakeup_fd_nospecial.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\wakeup_fd_pipe.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\wakeup_fd_posix.c"> + </ClCompile> <ClCompile Include="..\..\src\core\json\json.c"> </ClCompile> <ClCompile Include="..\..\src\core\json\json_reader.c"> |