Imported Debian patch 2.1.3-1debian/2.1.3-1

1 files changed, 185 insertions, 52 deletions

diff --git a/builds/msvc/libzmq/libzmq.vcproj b/builds/msvc/libzmq/libzmq.vcproj
index 95db1df..c774ac2 100644
--- a/builds/msvc/libzmq/libzmq.vcproj
+++ b/builds/msvc/libzmq/libzmq.vcproj
@@ -40,7 +40,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-DDLL_EXPORT"
+				AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=1024"
 				Optimization="0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -112,7 +112,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="-DDLL_EXPORT"
+				AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=1024"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				RuntimeLibrary="2"
@@ -160,6 +160,83 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="WithOpenPGM|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="copy ..\platform.hpp ..\..\..\src"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=1024"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="../../../../OpenPGM/include"
+				PreprocessorDefinitions="ZMQ_HAVE_OPENPGM"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Ws2_32.lib Rpcrt4.lib libpgm.lib"
+				OutputFile="../../../lib/libzmq.dll"
+				AdditionalLibraryDirectories="../../../../OpenPGM/lib"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -170,7 +247,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\src\app_thread.cpp"
+				RelativePath="..\..\..\src\clock.cpp"
 				>
 			</File>
 			<File
@@ -178,27 +255,39 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\connect_session.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\ctx.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\decoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\device.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\devpoll.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\push.cpp"
+				RelativePath="..\..\..\src\dist.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\epoll.cpp"
+				RelativePath="..\..\..\src\encoder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\err.cpp"
+				RelativePath="..\..\..\src\epoll.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\forwarder.cpp"
+				RelativePath="..\..\..\src\err.cpp"
 				>
 			</File>
 			<File
@@ -226,7 +315,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\msg_store.cpp"
+				RelativePath="..\..\..\src\mailbox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\named_session.cpp"
 				>
 			</File>
 			<File
@@ -238,7 +331,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\owned.cpp"
+				RelativePath="..\..\..\src\own.cpp"
 				>
 			</File>
 			<File
@@ -266,7 +359,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\prefix_tree.cpp"
+				RelativePath="..\..\..\src\poller_base.cpp"
 				>
 			</File>
 			<File
@@ -274,7 +367,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\queue.cpp"
+				RelativePath="..\..\..\src\pull.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\push.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\reaper.cpp"
 				>
 			</File>
 			<File
@@ -294,19 +395,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\signaler.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\socket_base.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\streamer.cpp"
+				RelativePath="..\..\..\src\sub.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\sub.cpp"
+				RelativePath="..\..\..\src\swap.cpp"
 				>
 			</File>
 			<File
@@ -326,7 +423,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\pull.cpp"
+				RelativePath="..\..\..\src\transient_session.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\trie.cpp"
 				>
 			</File>
 			<File
@@ -334,27 +435,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\xrep.cpp"
+				RelativePath="..\..\..\src\xpub.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\xreq.cpp"
+				RelativePath="..\..\..\src\xrep.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq.cpp"
+				RelativePath="..\..\..\src\xreq.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_connecter.cpp"
+				RelativePath="..\..\..\src\xsub.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_decoder.cpp"
+				RelativePath="..\..\..\src\zmq.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_encoder.cpp"
+				RelativePath="..\..\..\src\zmq_connecter.cpp"
 				>
 			</File>
 			<File
@@ -376,7 +477,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\src\app_thread.hpp"
+				RelativePath="..\..\..\src\array.hpp"
 				>
 			</File>
 			<File
@@ -388,6 +489,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\blob.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\clock.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\command.hpp"
 				>
 			</File>
@@ -396,6 +505,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\connect_session.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\ctx.hpp"
 				>
 			</File>
@@ -404,11 +517,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\device.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\devpoll.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\push.hpp"
+				RelativePath="..\..\..\src\dist.hpp"
 				>
 			</File>
 			<File
@@ -428,18 +545,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\forwarder.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\fq.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\i_endpoint.hpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\src\i_engine.hpp"
 				>
 			</File>
@@ -472,11 +581,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\msg_content.hpp"
+				RelativePath="..\..\..\src\likely.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\msg_store.hpp"
+				RelativePath="..\..\..\src\mailbox.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\msg_content.hpp"
 				>
 			</File>
 			<File
@@ -484,6 +597,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\named_session.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\object.hpp"
 				>
 			</File>
@@ -492,7 +609,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\owned.hpp"
+				RelativePath="..\..\..\src\own.hpp"
 				>
 			</File>
 			<File
@@ -516,7 +633,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\platform.hpp"
+				RelativePath="..\..\..\src\platform.hpp"
 				>
 			</File>
 			<File
@@ -524,7 +641,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\prefix_tree.hpp"
+				RelativePath="..\..\..\src\poller.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\poller_base.hpp"
 				>
 			</File>
 			<File
@@ -532,7 +653,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\queue.hpp"
+				RelativePath="..\..\..\src\pull.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\push.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\reaper.hpp"
 				>
 			</File>
 			<File
@@ -548,11 +677,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\session.hpp"
+				RelativePath="..\..\..\src\semaphore.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\signaler.hpp"
+				RelativePath="..\..\..\src\session.hpp"
 				>
 			</File>
 			<File
@@ -564,11 +693,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\streamer.hpp"
+				RelativePath="..\..\..\src\sub.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\sub.hpp"
+				RelativePath="..\..\..\src\swap.hpp"
 				>
 			</File>
 			<File
@@ -588,7 +717,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\pull.hpp"
+				RelativePath="..\..\..\src\transient_session.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\trie.hpp"
 				>
 			</File>
 			<File
@@ -604,31 +737,31 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\xrep.hpp"
+				RelativePath="..\..\..\src\xpub.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\xreq.hpp"
+				RelativePath="..\..\..\src\xrep.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\ypipe.hpp"
+				RelativePath="..\..\..\src\xreq.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\yqueue.hpp"
+				RelativePath="..\..\..\src\xsub.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_connecter.hpp"
+				RelativePath="..\..\..\src\ypipe.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_decoder.hpp"
+				RelativePath="..\..\..\src\yqueue.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\zmq_encoder.hpp"
+				RelativePath="..\..\..\src\zmq_connecter.hpp"
 				>
 			</File>
 			<File