diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am index 28674c6d..e960c39a 100644 --- a/builds/msvc/Makefile.am +++ b/builds/msvc/Makefile.am @@ -29,71 +29,73 @@ LIBZMQ_DIST = vs2008/libzmq.sln \ vs2013/libsodium.import.xml \ platform.hpp errno.cpp errno.hpp resource.h resource.rc -PERF_DIST = vs2008/c_local_lat/c_local_lat.vcproj \ - vs2008/c_local_thr/c_local_thr.vcproj \ - vs2008/c_remote_lat/c_remote_lat.vcproj \ - vs2008/c_remote_thr/c_remote_thr.vcproj \ +PERF_DIST = vs2008/local_lat/local_lat.vcproj \ + vs2008/local_thr/local_thr.vcproj \ + vs2008/remote_lat/remote_lat.vcproj \ + vs2008/remote_thr/remote_thr.vcproj \ vs2008/inproc_lat/inproc_lat.vcproj \ vs2008/inproc_thr/inproc_thr.vcproj \ - vs2010/c_local_lat/c_local_lat.vcxproj \ - vs2010/c_local_thr/c_local_thr.vcxproj \ - vs2010/c_remote_lat/c_remote_lat.vcxproj \ - vs2010/c_remote_thr/c_remote_thr.vcxproj \ + vs2010/local_lat/local_lat.vcxproj \ + vs2010/local_thr/local_thr.vcxproj \ + vs2010/remote_lat/remote_lat.vcxproj \ + vs2010/remote_thr/remote_thr.vcxproj \ vs2010/inproc_lat/inproc_lat.vcxproj \ vs2010/inproc_thr/inproc_thr.vcxproj \ - vs2010/c_local_lat/c_local_lat.props \ - vs2010/c_local_thr/c_local_thr.props \ - vs2010/c_remote_lat/c_remote_lat.props \ - vs2010/c_remote_thr/c_remote_thr.props \ + vs2010/local_lat/local_lat.props \ + vs2010/local_thr/local_thr.props \ + vs2010/remote_lat/remote_lat.props \ + vs2010/remote_thr/remote_thr.props \ vs2010/inproc_lat/inproc_lat.props \ vs2010/inproc_thr/inproc_thr.props \ - vs2012/c_local_lat/c_local_lat.vcxproj \ - vs2012/c_local_thr/c_local_thr.vcxproj \ - vs2012/c_remote_lat/c_remote_lat.vcxproj \ - vs2012/c_remote_thr/c_remote_thr.vcxproj \ + vs2012/local_lat/local_lat.vcxproj \ + vs2012/local_thr/local_thr.vcxproj \ + vs2012/remote_lat/remote_lat.vcxproj \ + vs2012/remote_thr/remote_thr.vcxproj \ vs2012/inproc_lat/inproc_lat.vcxproj \ vs2012/inproc_thr/inproc_thr.vcxproj \ - vs2012/c_local_lat/c_local_lat.props \ - vs2012/c_local_thr/c_local_thr.props \ - vs2012/c_remote_lat/c_remote_lat.props \ - vs2012/c_remote_thr/c_remote_thr.props \ + vs2012/local_lat/local_lat.props \ + vs2012/local_thr/local_thr.props \ + vs2012/remote_lat/remote_lat.props \ + vs2012/remote_thr/remote_thr.props \ vs2012/inproc_lat/inproc_lat.props \ vs2012/inproc_thr/inproc_thr.props \ - vs2013/c_local_lat/c_local_lat.vcxproj \ - vs2013/c_local_thr/c_local_thr.vcxproj \ - vs2013/c_remote_lat/c_remote_lat.vcxproj \ - vs2013/c_remote_thr/c_remote_thr.vcxproj \ + vs2013/local_lat/local_lat.vcxproj \ + vs2013/local_thr/local_thr.vcxproj \ + vs2013/remote_lat/remote_lat.vcxproj \ + vs2013/remote_thr/remote_thr.vcxproj \ vs2013/inproc_lat/inproc_lat.vcxproj \ vs2013/inproc_thr/inproc_thr.vcxproj \ - vs2013/c_local_lat/c_local_lat.props \ - vs2013/c_local_thr/c_local_thr.props \ - vs2013/c_remote_lat/c_remote_lat.props \ - vs2013/c_remote_thr/c_remote_thr.props \ + vs2013/local_lat/local_lat.props \ + vs2013/local_thr/local_thr.props \ + vs2013/remote_lat/remote_lat.props \ + vs2013/remote_thr/remote_thr.props \ vs2013/inproc_lat/inproc_lat.props \ vs2013/inproc_thr/inproc_thr.props -PROPERTIES_DIST = properties/Common.props \ - properties/Console.props \ - properties/ConsoleDebugDynamic.props \ - properties/ConsoleDebugLinkTimeCodeGeneration.props \ - properties/ConsoleDebugStatic.props \ - properties/ConsoleReleaseDynamic.props \ - properties/ConsoleReleaseLinkTimeCodeGeneration.props \ - properties/ConsoleReleaseStatic.props \ - properties/Debug.props \ - properties/Dynamic.props \ - properties/DynamicDebug.props \ - properties/DynamicRelease.props \ - properties/LinkTimeCodeGeneration.props \ - properties/Release.props \ - properties/Static.props \ - properties/StaticDebug.props \ - properties/StaticDebugLinkTimeCodeGeneration.props \ - properties/StaticLinkTimeCodeGeneration.props \ - properties/StaticRelease.props \ - properties/StaticReleaseLinkTimeCodeGeneration.props \ - properties/Win32.props \ - properties/x64.props +PROPERTIES_DIST = properties/Common.props + properties/DebugDEXE.props + properties/DebugDLL.props + properties/DebugLEXE.props + properties/DebugLIB.props + properties/DebugLTCG.props + properties/Debug.props + properties/DebugSEXE.props + properties/DLL.props + properties/EXE.props + properties/LIB.props + properties/Link.props + properties/LTCG.props + properties/Messages.props + properties/Output.props + properties/ReleaseDEXE.props + properties/ReleaseDLL.props + properties/ReleaseLEXE.props + properties/ReleaseLIB.props + properties/ReleaseLTCG.props + properties/Release.props + properties/ReleaseSEXE.props + properties/Win32.props + properties/x64.props PRECOMPILED_DIST = ../../src/precompiled.hpp \ ../../src/precompiled.cpp diff --git a/builds/redhat/zeromq.spec.in b/builds/redhat/zeromq.spec.in index 4a2b29b4..61b34c07 100644 --- a/builds/redhat/zeromq.spec.in +++ b/builds/redhat/zeromq.spec.in @@ -8,10 +8,10 @@ URL: http://www.zeromq.org/ Source: http://download.zeromq.org/%{name}-%{version}.tar.gz Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc, make, gcc-c++, libstdc++-devel +BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto Requires: libstdc++ -if %{?rhel}%{!?rhel:0} >= 6 +%if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: libuuid-devel Requires: libuuid %elseif %{?rhel}%{!?rhel:0} >= 5 @@ -90,8 +90,8 @@ This package contains ZeroMQ related development libraries and header files. %{_bindir}/curve_keygen # libraries -%{_libdir}/libzmq.so.3 -%{_libdir}/libzmq.so.3.1.0 +%{_libdir}/libzmq.so.4 +%{_libdir}/libzmq.so.4.0.0 %{_mandir}/man7/zmq.7.gz @@ -109,7 +109,6 @@ This package contains ZeroMQ related development libraries and header files. %{_mandir}/man3/zmq_close.3.gz %{_mandir}/man3/zmq_connect.3.gz %{_mandir}/man3/zmq_disconnect.3.gz -%{_mandir}/man3/zmq_ctx_destroy.3.gz %{_mandir}/man3/zmq_ctx_get.3.gz %{_mandir}/man3/zmq_ctx_new.3.gz %{_mandir}/man3/zmq_ctx_set.3.gz @@ -117,7 +116,6 @@ This package contains ZeroMQ related development libraries and header files. %{_mandir}/man3/zmq_msg_recv.3.gz %{_mandir}/man3/zmq_errno.3.gz %{_mandir}/man3/zmq_getsockopt.3.gz -%{_mandir}/man3/zmq_init.3.gz %{_mandir}/man3/zmq_msg_close.3.gz %{_mandir}/man3/zmq_msg_copy.3.gz %{_mandir}/man3/zmq_msg_data.3.gz @@ -140,9 +138,12 @@ This package contains ZeroMQ related development libraries and header files. %{_mandir}/man3/zmq_socket.3.gz %{_mandir}/man3/zmq_socket_monitor.3.gz %{_mandir}/man3/zmq_strerror.3.gz -%{_mandir}/man3/zmq_term.3.gz %{_mandir}/man3/zmq_version.3.gz %{_mandir}/man3/zmq_unbind.3.gz +%{_mandir}/man3/zmq_ctx_shutdown.3.gz +%{_mandir}/man3/zmq_has.3.gz +%{_mandir}/man3/zmq_msg_gets.3.gz +%{_mandir}/man3/zmq_proxy_steerable.3.gz %{_mandir}/man7/zmq_epgm.7.gz %{_mandir}/man7/zmq_inproc.7.gz %{_mandir}/man7/zmq_ipc.7.gz @@ -155,6 +156,7 @@ This package contains ZeroMQ related development libraries and header files. %{_mandir}/man7/zmq_curve.7.gz %{_mandir}/man7/zmq_null.7.gz %{_mandir}/man7/zmq_plain.7.gz +%{_mandir}/man7/zmq_tipc.7.gz %changelog * Tue Jun 10 2014 Tristian Celestin 4.0.4 diff --git a/src/Makefile.am b/src/Makefile.am index 89c5f16f..e6fdb396 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,6 @@ libzmq_la_SOURCES = \ i_decoder.hpp \ i_engine.hpp \ i_poll_events.hpp \ - i_properties.hpp \ io_object.hpp \ io_thread.hpp \ ip.hpp \ @@ -216,4 +215,5 @@ dist-hook: -rm $(distdir)/platform.hpp EXTRA_DIST = \ - libzmq.pc.cmake.in + libzmq.pc.cmake.in \ + libzmq.vers diff --git a/src/signaler.cpp b/src/signaler.cpp index d064d299..25667bf5 100644 --- a/src/signaler.cpp +++ b/src/signaler.cpp @@ -361,7 +361,11 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_) else if (signaler_port != 0) { wchar_t mutex_name [MAX_PATH]; +# ifdef __MINGW32__ + _snwprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d", signaler_port); +# else swprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d", signaler_port); +# endif # if !defined _WIN32_WCE sync = CreateMutexW (&sa, FALSE, mutex_name);