Merge pull request #1348 from evoskuil/master

Problem: VS projects missing client/server.

Merge pull request #1348 from evoskuil/master
Problem: VS projects missing client/server.
88c6e696 · Pieter Hintjens · 405a7495 · 6bf1609a · 88c6e696 · 88c6e696
Commit 88c6e696 authored Feb 11, 2015 by Pieter Hintjens
12 changed files
--- a/builds/msvc/resource.rc
+++ b/builds/msvc/resource.rc
 B// Microsoft Visual C++ generated resource script.

--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@@ -73,6 +73,7 @@
    <ClInclude Include="..\..\..\..\src\array.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
+    <ClInclude Include="..\..\..\..\src\client.hpp" />
    <ClInclude Include="..\..\..\..\src\clock.hpp" />
    <ClInclude Include="..\..\..\..\src\command.hpp" />
    <ClInclude Include="..\..\..\..\src\config.hpp" />
@@ -113,6 +114,7 @@
    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
+    <ClInclude Include="..\..\..\..\src\server.hpp" />
    <ClInclude Include="..\..\..\..\src\socks.hpp" />
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
    <ClInclude Include="..\..\platform.hpp" />
@@ -158,6 +160,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\address.cpp" />
+    <ClCompile Include="..\..\..\..\src\client.cpp" />
    <ClCompile Include="..\..\..\..\src\clock.cpp" />
    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
@@ -210,6 +213,7 @@
    <ClCompile Include="..\..\..\..\src\req.cpp" />
    <ClCompile Include="..\..\..\..\src\router.cpp" />
    <ClCompile Include="..\..\..\..\src\select.cpp" />
+    <ClCompile Include="..\..\..\..\src\server.cpp" />
    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
@@ -247,4 +251,4 @@
    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@@ -226,6 +226,12 @@
    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\server.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\client.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -492,6 +498,12 @@
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\server.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\client.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">

--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@@ -73,6 +73,7 @@
    <ClInclude Include="..\..\..\..\src\array.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
+    <ClInclude Include="..\..\..\..\src\client.hpp" />
    <ClInclude Include="..\..\..\..\src\clock.hpp" />
    <ClInclude Include="..\..\..\..\src\command.hpp" />
    <ClInclude Include="..\..\..\..\src\config.hpp" />
@@ -113,6 +114,7 @@
    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
+    <ClInclude Include="..\..\..\..\src\server.hpp" />
    <ClInclude Include="..\..\..\..\src\socks.hpp" />
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
    <ClInclude Include="..\..\platform.hpp" />
@@ -158,6 +160,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\address.cpp" />
+    <ClCompile Include="..\..\..\..\src\client.cpp" />
    <ClCompile Include="..\..\..\..\src\clock.cpp" />
    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
@@ -210,6 +213,7 @@
    <ClCompile Include="..\..\..\..\src\req.cpp" />
    <ClCompile Include="..\..\..\..\src\router.cpp" />
    <ClCompile Include="..\..\..\..\src\select.cpp" />
+    <ClCompile Include="..\..\..\..\src\server.cpp" />
    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
@@ -247,4 +251,4 @@
    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@@ -226,6 +226,12 @@
    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\server.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\client.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -492,6 +498,12 @@
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\server.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\client.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">

--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -73,6 +73,7 @@
    <ClInclude Include="..\..\..\..\src\array.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
+    <ClInclude Include="..\..\..\..\src\client.hpp" />
    <ClInclude Include="..\..\..\..\src\clock.hpp" />
    <ClInclude Include="..\..\..\..\src\command.hpp" />
    <ClInclude Include="..\..\..\..\src\config.hpp" />
@@ -113,6 +114,7 @@
    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
+    <ClInclude Include="..\..\..\..\src\server.hpp" />
    <ClInclude Include="..\..\..\..\src\socks.hpp" />
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
    <ClInclude Include="..\..\platform.hpp" />
@@ -158,6 +160,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\address.cpp" />
+    <ClCompile Include="..\..\..\..\src\client.cpp" />
    <ClCompile Include="..\..\..\..\src\clock.cpp" />
    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
@@ -210,6 +213,7 @@
    <ClCompile Include="..\..\..\..\src\req.cpp" />
    <ClCompile Include="..\..\..\..\src\router.cpp" />
    <ClCompile Include="..\..\..\..\src\select.cpp" />
+    <ClCompile Include="..\..\..\..\src\server.cpp" />
    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
@@ -247,4 +251,4 @@
    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -226,6 +226,12 @@
    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\server.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\client.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -492,6 +498,12 @@
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\server.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\client.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">

--- a/packaging/nuget/package.config
+++ b/packaging/nuget/package.config
 <?xml version="1.0" encoding="utf-8"?>
 <!-- These values are populated into the package.gsl templates by package.bat. -->
 <!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libzmq_vc120" target="libzmq" version = "4.1.0.7" pathversion="4_1_0_7" platformtoolset="v120">
+<package id="libzmq_vc120" target="libzmq" version = "4.2.0.0" pathversion="4_2_0_0" platformtoolset="v120">
  <dependency id="libsodium_vc120" version="0.5.0.0" />
 </package>
\ No newline at end of file
--- a/packaging/nuget/package.nuspec
+++ b/packaging/nuget/package.nuspec
@@ -7,7 +7,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
    <metadata minClientVersion="2.5">
        <id>libzmq_vc120</id>
-        <version>4.1.0.7</version>
+        <version>4.2.0.0</version>
        <title>libzmq_vc120</title>
        <authors>libzmq contributors</authors>
        <owners>Eric Voskuil</owners>
@@ -44,52 +44,52 @@
        <!-- libraries -->
        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_7.dll" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_2_0_0.dll" />
-        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_7.dll" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_2_0_0.dll" />
        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_7.pdb" />-->
+        <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_2_0_0.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_7.pdb" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_2_0_0.pdb" />
        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_7.imp.lib" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-4_2_0_0.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_7.imp.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_2_0_0.imp.lib" />
        <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_7.exp" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-4_2_0_0.exp" />
-        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_7.exp" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_2_0_0.exp" />
        <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_7.lib" />
+        <file src="..\..\bin\Win32\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_2_0_0.lib" />
-        <file src="..\..\bin\Win32\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_7.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_2_0_0.lib" />
        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_7.ltcg.lib" />
+        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_2_0_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_7.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_2_0_0.ltcg.lib" />
        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_7.dll" />
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_2_0_0.dll" />
-        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_7.dll" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_2_0_0.dll" />
        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_7.pdb" />-->
+        <!--<file src="..\..\bin\x64\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_2_0_0.pdb" />-->
-        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_7.pdb" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_2_0_0.pdb" />
        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_7.imp.lib" />
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-4_2_0_0.imp.lib" />
-        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_7.imp.lib" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_2_0_0.imp.lib" />
        <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_7.exp" />
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-4_2_0_0.exp" />
-        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_7.exp" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_2_0_0.exp" />
        <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_7.lib" />
+        <file src="..\..\bin\x64\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_2_0_0.lib" />
-        <file src="..\..\bin\x64\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_7.lib" />
+        <file src="..\..\bin\x64\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_2_0_0.lib" />
        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_7.ltcg.lib" />
+        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_2_0_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_7.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_2_0_0.ltcg.lib" />
    </files>
 <!--
 #################################################################

--- a/packaging/nuget/package.targets
+++ b/packaging/nuget/package.targets
@@ -32,66 +32,66 @@
  <!-- static libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-s-4_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-s-4_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_7.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_2_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <!-- static ltcg libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-s-4_1_0_7.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-s-4_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_1_0_7.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-sgd-4_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-s-4_1_0_7.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-s-4_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_1_0_7.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-sgd-4_2_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <!-- dynamic import libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-4_1_0_7.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-4_2_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x86-v120-mt-gd-4_1_0_7.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x86-v120-mt-gd-4_2_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-4_1_0_7.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-4_2_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libzmq-x64-v120-mt-gd-4_1_0_7.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libzmq-x64-v120-mt-gd-4_2_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
@@ -100,26 +100,26 @@
  <Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Release"
          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_7.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_2_0_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_1_0_7.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-4_2_0_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
  </Target>
  <Target Name="libzmq_AfterBuild_Win32_v120_Dynamic_Debug"
          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_7.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_2_0_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_1_0_7.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v120-mt-gd-4_2_0_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
  </Target>
  <Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Release"
          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_7.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_2_0_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_1_0_7.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-4_2_0_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
  </Target>
  <Target Name="libzmq_AfterBuild_x64_v120_Dynamic_Debug"
          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_7.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_2_0_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_1_0_7.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v120-mt-gd-4_2_0_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
  </Target>
 <!--

--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -179,7 +179,7 @@ int zmq::stream_t::xsetsockopt (int option_, const void *optval_,
        case ZMQ_STREAM_NOTIFY:
            if (is_int && (value == 0 || value == 1)) {
-                options.raw_notify = value;
+                options.raw_notify = (value != 0);
                return 0;
            }
            break;

--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -627,8 +627,7 @@ int zmq_msg_get (zmq_msg_t *msg_, int property_)
        case ZMQ_MORE:
            return (((zmq::msg_t*) msg_)->flags () & zmq::msg_t::more)? 1: 0;
        case ZMQ_SRCFD:
-            // warning: int64_t to int
+            return (int)((zmq::msg_t*) msg_)->fd ();
-            return ((zmq::msg_t*) msg_)->fd ();
        case ZMQ_SHARED:
            return (((zmq::msg_t*) msg_)->is_cmsg ()) ||
                   (((zmq::msg_t*) msg_)->flags () & zmq::msg_t::shared)? 1: 0;