Skip to content

L
libzmq
Commit 6f94af8c authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Problem: various errors in build scripts 

- zmq_utils.h was removed
- udp_address.cpp and udp_engine.cpp were added

Solution: patch all affected build scripts
parent 3cf6c331
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 42 deletions
Makefile.am
View file @ 6f94af8c
......@@ -16,8 +16,7 @@ AM_CPPFLAGS = \
lib_LTLIBRARIES = src/libzmq.la
include_HEADERS = \
include/zmq.h \
include/zmq_utils.h
include/zmq.h
src_libzmq_la_SOURCES = \
src/address.cpp \
......@@ -231,7 +230,6 @@ src_libzmq_la_SOURCES = \
src/socket_poller.hpp \
src/socket_poller.cpp
if ON_MINGW
src_libzmq_la_LDFLAGS = \
-no-undefined \
......
builds/cygwin/Makefile.cygwin
View file @ 6f94af8c
......@@ -18,6 +18,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
pgm_socket.o pgm_receiver.o pgm_sender.o \
raw_decoder.o raw_encoder.o \
v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
udp_address.o upd_engine.o radio.o dish.o \
socket_base.o session_base.o options.o \
req.o rep.o push.o pull.o pub.o sub.o pair.o \
dealer.o router.o xpub.o xsub.o stream.o \
......
builds/mingw32/Makefile.mingw32
View file @ 6f94af8c
......@@ -18,6 +18,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
pgm_socket.o pgm_receiver.o pgm_sender.o \
raw_decoder.o raw_encoder.o \
v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
udp_address.o upd_engine.o radio.o dish.o \
socket_base.o session_base.o options.o \
req.o rep.o push.o pull.o pub.o sub.o pair.o \
dealer.o router.o xpub.o xsub.o stream.o \
......
builds/msvc/vs2008/libzmq/libzmq.vcproj
View file @ 6f94af8c
......@@ -100,6 +100,7 @@
<References />
<Files>
<Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File RelativePath="..\..\errno.cpp" />
<File RelativePath="..\..\..\..\src\address.cpp" />
<File RelativePath="..\..\..\..\src\clock.cpp" />
<File RelativePath="..\..\..\..\src\ctx.cpp" />
......@@ -109,7 +110,6 @@
<File RelativePath="..\..\..\..\src\dist.cpp" />
<File RelativePath="..\..\..\..\src\epoll.cpp" />
<File RelativePath="..\..\..\..\src\err.cpp" />
<File RelativePath="..\..\errno.cpp" />
<File RelativePath="..\..\..\..\src\fq.cpp" />
<File RelativePath="..\..\..\..\src\io_object.cpp" />
<File RelativePath="..\..\..\..\src\io_thread.cpp" />
......@@ -168,12 +168,15 @@
<File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
<File RelativePath="..\..\..\..\src\v2_decoder.cpp" />
<File RelativePath="..\..\..\..\src\v2_encoder.cpp" />
<File RelativePath="..\..\..\..\src\udp_address.cpp" />
<File RelativePath="..\..\..\..\src\udp_engine.cpp" />
<File RelativePath="..\..\..\..\src\xpub.cpp" />
<File RelativePath="..\..\..\..\src\xsub.cpp" />
<File RelativePath="..\..\..\..\src\zmq.cpp" />
<File RelativePath="..\..\..\..\src\zmq_utils.cpp" />
</Filter>
<Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File RelativePath="..\..\errno.hpp" />
<File RelativePath="..\..\..\..\src\address.hpp" />
<File RelativePath="..\..\..\..\src\array.hpp" />
<File RelativePath="..\..\..\..\src\atomic_counter.hpp" />
......@@ -189,7 +192,6 @@
<File RelativePath="..\..\..\..\src\encoder.hpp" />
<File RelativePath="..\..\..\..\src\epoll.hpp" />
<File RelativePath="..\..\..\..\src\err.hpp" />
<File RelativePath="..\..\errno.hpp" />
<File RelativePath="..\..\..\..\src\fd.hpp" />
<File RelativePath="..\..\..\..\src\fq.hpp" />
<File RelativePath="..\..\..\..\src\i_engine.hpp" />
......@@ -256,6 +258,8 @@
<File RelativePath="..\..\..\..\src\v2_decoder.hpp" />
<File RelativePath="..\..\..\..\src\v2_encoder.hpp" />
<File RelativePath="..\..\..\..\src\v2_protocol.hpp" />
<File RelativePath="..\..\..\..\src\udp_address.hpp" />
<File RelativePath="..\..\..\..\src\udp_engine.hpp" />
<File RelativePath="..\..\..\..\src\windows.hpp" />
<File RelativePath="..\..\..\..\src\wire.hpp" />
<File RelativePath="..\..\..\..\src\xpub.hpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View file @ 6f94af8c
......@@ -67,8 +67,9 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\include\zmq_utils.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
......@@ -121,7 +122,6 @@
<ClInclude Include="..\..\..\..\src\server.hpp" />
<ClInclude Include="..\..\..\..\src\socks.hpp" />
<ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\..\..\src\poll.hpp" />
<ClInclude Include="..\..\..\..\src\poller.hpp" />
<ClInclude Include="..\..\..\..\src\poller_base.hpp" />
......@@ -154,6 +154,8 @@
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\windows.hpp" />
<ClInclude Include="..\..\..\..\src\wire.hpp" />
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
......@@ -162,7 +164,6 @@
<ClInclude Include="..\..\..\..\src\xsub.hpp" />
<ClInclude Include="..\..\..\..\src\ypipe.hpp" />
<ClInclude Include="..\..\..\..\src\yqueue.hpp" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\address.cpp" />
......@@ -244,6 +245,8 @@
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
......
builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
View file @ 6f94af8c
......@@ -243,9 +243,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\zmq.h">
<Filter>include</Filter>
</ClInclude>
......@@ -567,4 +564,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View file @ 6f94af8c
......@@ -67,8 +67,9 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\include\zmq_utils.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
......@@ -121,7 +122,6 @@
<ClInclude Include="..\..\..\..\src\server.hpp" />
<ClInclude Include="..\..\..\..\src\socks.hpp" />
<ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\..\..\src\poll.hpp" />
<ClInclude Include="..\..\..\..\src\poller.hpp" />
<ClInclude Include="..\..\..\..\src\poller_base.hpp" />
......@@ -154,6 +154,8 @@
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\windows.hpp" />
<ClInclude Include="..\..\..\..\src\wire.hpp" />
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
......@@ -162,7 +164,6 @@
<ClInclude Include="..\..\..\..\src\xsub.hpp" />
<ClInclude Include="..\..\..\..\src\ypipe.hpp" />
<ClInclude Include="..\..\..\..\src\yqueue.hpp" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\address.cpp" />
......@@ -244,6 +245,8 @@
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
......
builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
View file @ 6f94af8c
......@@ -243,9 +243,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\zmq.h">
<Filter>include</Filter>
</ClInclude>
......@@ -567,4 +564,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ 6f94af8c
......@@ -67,8 +67,9 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\include\zmq_utils.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
......@@ -121,7 +122,6 @@
<ClInclude Include="..\..\..\..\src\server.hpp" />
<ClInclude Include="..\..\..\..\src\socks.hpp" />
<ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\..\..\src\poll.hpp" />
<ClInclude Include="..\..\..\..\src\poller.hpp" />
<ClInclude Include="..\..\..\..\src\poller_base.hpp" />
......@@ -154,6 +154,8 @@
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\windows.hpp" />
<ClInclude Include="..\..\..\..\src\wire.hpp" />
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
......@@ -162,7 +164,6 @@
<ClInclude Include="..\..\..\..\src\xsub.hpp" />
<ClInclude Include="..\..\..\..\src\ypipe.hpp" />
<ClInclude Include="..\..\..\..\src\yqueue.hpp" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\address.cpp" />
......@@ -244,6 +245,8 @@
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
......
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View file @ 6f94af8c
......@@ -243,9 +243,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\zmq.h">
<Filter>include</Filter>
</ClInclude>
......@@ -567,4 +564,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2015/libzmq/libzmq.vcxproj
View file @ 6f94af8c
......@@ -75,8 +75,9 @@
<Option-sodium />
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
<ClInclude Include="..\..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\..\include\zmq_utils.h" />
<ClInclude Include="..\..\..\..\src\address.hpp" />
<ClInclude Include="..\..\..\..\src\array.hpp" />
<ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
......@@ -129,9 +130,6 @@
<ClInclude Include="..\..\..\..\src\server.hpp" />
<ClInclude Include="..\..\..\..\src\socks.hpp" />
<ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\..\..\src\poll.hpp" />
<ClInclude Include="..\..\..\..\src\poller.hpp" />
<ClInclude Include="..\..\..\..\src\poller_base.hpp" />
......@@ -164,6 +162,8 @@
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
<ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\windows.hpp" />
<ClInclude Include="..\..\..\..\src\wire.hpp" />
<ClInclude Include="..\..\..\..\src\xpub.hpp" />
......@@ -172,7 +172,6 @@
<ClInclude Include="..\..\..\..\src\xsub.hpp" />
<ClInclude Include="..\..\..\..\src\ypipe.hpp" />
<ClInclude Include="..\..\..\..\src\yqueue.hpp" />
<ClInclude Include="..\..\resource.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\address.cpp" />
......@@ -256,6 +255,8 @@
<ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
<ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\..\src\zmq.cpp" />
......@@ -275,4 +276,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2015/libzmq/libzmq.vcxproj.filters
View file @ 6f94af8c
......@@ -258,9 +258,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\zmq.h">
<Filter>include</Filter>
</ClInclude>
......@@ -597,4 +594,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file
</Project>
src/options.cpp
View file @ 6f94af8c
......@@ -32,7 +32,6 @@
#include "options.hpp"
#include "err.hpp"
#include "macros.hpp"
#include "../include/zmq_utils.h"
zmq::options_t::options_t () :
sndhwm (1000),
......
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