Skip to content

L
libzmq
Commit 34164ec6 authored by Constantin Rack's avatar Constantin Rack
Browse files
Options

Merge pull request #2001 from evoskuil/master 

Problem: unresolved dgram externals in msvc builds.
parents d0180296 c7f16737
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 4 deletions
builds/msvc/vs2008/libzmq/libzmq.vcproj
View file @ 34164ec6
......@@ -106,6 +106,7 @@
<File RelativePath="..\..\..\..\src\ctx.cpp" />
<File RelativePath="..\..\..\..\src\dealer.cpp" />
<File RelativePath="..\..\..\..\src\devpoll.cpp" />
<File RelativePath="..\..\..\..\src\dgram.cpp" />
<File RelativePath="..\..\..\..\src\dish.cpp" />
<File RelativePath="..\..\..\..\src\dist.cpp" />
<File RelativePath="..\..\..\..\src\epoll.cpp" />
......@@ -181,12 +182,14 @@
<File RelativePath="..\..\..\..\src\array.hpp" />
<File RelativePath="..\..\..\..\src\atomic_counter.hpp" />
<File RelativePath="..\..\..\..\src\atomic_ptr.hpp" />
<File RelativePath="..\..\..\..\src\blob.hpp" />
<File RelativePath="..\..\..\..\src\clock.hpp" />
<File RelativePath="..\..\..\..\src\command.hpp" />
<File RelativePath="..\..\..\..\src\config.hpp" />
<File RelativePath="..\..\..\..\src\ctx.hpp" />
<File RelativePath="..\..\..\..\src\decoder.hpp" />
<File RelativePath="..\..\..\..\src\devpoll.hpp" />
<File RelativePath="..\..\..\..\src\dgram.hpp" />
<File RelativePath="..\..\..\..\src\dish.hpp" />
<File RelativePath="..\..\..\..\src\dist.hpp" />
<File RelativePath="..\..\..\..\src\encoder.hpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 34164ec6
......@@ -70,10 +70,12 @@
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\src\zmq_draft.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
<ClInclude Include="..\..\..\..\src\blob.hpp" />
<ClInclude Include="..\..\..\..\src\client.hpp" />
<ClInclude Include="..\..\..\..\src\clock.hpp" />
<ClInclude Include="..\..\..\..\src\command.hpp" />
......@@ -85,6 +87,7 @@
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dgram.hpp" />
<ClInclude Include="..\..\..\..\src\dish.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
......@@ -178,6 +181,7 @@
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dgram.cpp" />
<ClCompile Include="..\..\..\..\src\dish.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
View file @ 34164ec6
......@@ -16,6 +16,9 @@
<ClCompile Include="..\..\..\..\src\devpoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dgram.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dist.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -282,6 +285,9 @@
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\blob.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clock.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -297,6 +303,9 @@
<ClInclude Include="..\..\..\..\src\devpoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dgram.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dist.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -567,6 +576,9 @@
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="include">
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 34164ec6
......@@ -70,6 +70,8 @@
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\src\zmq_draft.h" />
<ClInclude Include="..\..\..\..\src\blob.hpp" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
......@@ -85,6 +87,7 @@
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dgram.hpp" />
<ClInclude Include="..\..\..\..\src\dish.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
......@@ -178,6 +181,7 @@
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dgram.cpp" />
<ClCompile Include="..\..\..\..\src\dish.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
View file @ 34164ec6
......@@ -16,6 +16,9 @@
<ClCompile Include="..\..\..\..\src\devpoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dgram.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dist.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -282,6 +285,9 @@
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\blob.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clock.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -297,6 +303,9 @@
<ClInclude Include="..\..\..\..\src\devpoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dgram.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dist.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -567,6 +576,9 @@
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="include">
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 34164ec6
......@@ -67,14 +67,15 @@
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\zmq_draft.h" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\src\zmq_draft.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
<ClInclude Include="..\..\..\..\src\blob.hpp" />
<ClInclude Include="..\..\..\..\src\client.hpp" />
<ClInclude Include="..\..\..\..\src\clock.hpp" />
<ClInclude Include="..\..\..\..\src\command.hpp" />
......@@ -86,6 +87,7 @@
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dgram.hpp" />
<ClInclude Include="..\..\..\..\src\dish.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
......@@ -179,6 +181,7 @@
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dgram.cpp" />
<ClCompile Include="..\..\..\..\src\dish.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View file @ 34164ec6
......@@ -16,6 +16,9 @@
<ClCompile Include="..\..\..\..\src\devpoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dgram.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dist.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -282,6 +285,9 @@
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\blob.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clock.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -297,6 +303,9 @@
<ClInclude Include="..\..\..\..\src\devpoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dgram.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dist.hpp">
<Filter>src\include</Filter>
</ClInclude>
......
builds/msvc/vs2015/libzmq/libzmq.vcxproj
View file @ 34164ec6
......@@ -70,10 +70,12 @@
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\src\zmq_draft.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
<ClInclude Include="..\..\..\..\src\blob.hpp" />
<ClInclude Include="..\..\..\..\src\client.hpp" />
<ClInclude Include="..\..\..\..\src\clock.hpp" />
<ClInclude Include="..\..\..\..\src\command.hpp" />
......@@ -85,6 +87,7 @@
<ClInclude Include="..\..\..\..\src\decoder.hpp" />
<ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
<ClInclude Include="..\..\..\..\src\devpoll.hpp" />
<ClInclude Include="..\..\..\..\src\dgram.hpp" />
<ClInclude Include="..\..\..\..\src\dish.hpp" />
<ClInclude Include="..\..\..\..\src\dist.hpp" />
<ClInclude Include="..\..\..\..\src\encoder.hpp" />
......@@ -178,6 +181,7 @@
<ClCompile Include="..\..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
<ClCompile Include="..\..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\..\src\dgram.cpp" />
<ClCompile Include="..\..\..\..\src\dish.cpp" />
<ClCompile Include="..\..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\..\src\epoll.cpp" />
......
builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
View file @ 34164ec6
......@@ -16,6 +16,9 @@
<ClCompile Include="..\..\..\..\src\devpoll.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dgram.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\dist.cpp">
<Filter>src</Filter>
</ClCompile>
......@@ -282,6 +285,9 @@
<ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\blob.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\clock.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -297,6 +303,9 @@
<ClInclude Include="..\..\..\..\src\devpoll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dgram.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\dist.hpp">
<Filter>src\include</Filter>
</ClInclude>
......@@ -567,6 +576,9 @@
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="include">
......
src/udp_engine.cpp
View file @ 34164ec6
......@@ -167,9 +167,9 @@ void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg, sockaddr_in* addr)
char* name = inet_ntoa(addr->sin_addr);
char port[6];
sprintf (port, "%d", (int)ntohs (addr->sin_port));
sprintf (port, "%d", (int) ntohs (addr->sin_port));
int size = strlen (name) + strlen (port) + 1 + 1; // Colon + NULL
int size = (int) strlen (name) + (int) strlen (port) + 1 + 1; // Colon + NULL
int rc = msg->init_size (size);
errno_assert (rc == 0);
msg->set_flags (msg_t::more);
......@@ -188,7 +188,7 @@ int zmq::udp_engine_t::resolve_raw_address (char *name_, size_t length_)
// Find delimiter, cannot use memrchr as it is not supported on windows
if (length_ != 0) {
int chars_left = length_;
int chars_left = (int) length_;
char *current_char = name_ + length_;
do {
if (*(--current_char) == ':') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment