diff options
| author |  David Klempner <klempner@google.com> | 2015-01-26 15:37:23 -0800 |
|---|---|---|
| committer | David Klempner <klempner@google.com> | 2015-01-26 15:37:23 -0800 |
| commit | 6e8bdb9a02f6030798f85af1cd32da5a6f0ba34b (patch) | |
| tree | fa5cb327cfdeda622f3be6d44cf83d6142616d7b /vsprojects/vs2013/grpc_unsecure.vcxproj | |
| parent | 78dc6cdaeb533cb03cd8a3b3bea6e6d7847083aa (diff) | |
| parent | 7d8dcd719d8972e70f124d237af4f662c9362f15 (diff) | |
Merge branch 'master' into eventfd
This includes nuking the special pollset_kick_windows.h, since it is no
longer relevant.
Diffstat (limited to 'vsprojects/vs2013/grpc_unsecure.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc_unsecure.vcxproj | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 8cec794439..1f2f30d6be 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -121,6 +121,7 @@ <ClInclude Include="..\..\src\core\iomgr\pollset.h" /> <ClInclude Include="..\..\src\core\iomgr\pollset_kick.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 +255,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> |