Merge pull request #385 from jdc8/master

Missing semi-colon makes Windows compilation fail, Missing files in WIndows solution file

builds/msvc/libzmq/libzmq.vcxproj

@@ -153,6 +153,7 @@
     <ClCompile Include="..\..\..\src\socket_base.cpp" />
     <ClCompile Include="..\..\..\src\stream_engine.cpp" />
     <ClCompile Include="..\..\..\src\sub.cpp" />
+    <ClCompile Include="..\..\..\src\tcp.cpp" />
     <ClCompile Include="..\..\..\src\tcp_address.cpp" />
     <ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
     <ClCompile Include="..\..\..\src\tcp_listener.cpp" />
@@ -224,6 +225,7 @@
     <ClInclude Include="..\..\..\src\stdint.hpp" />
     <ClInclude Include="..\..\..\src\stream_engine.hpp" />
     <ClInclude Include="..\..\..\src\sub.hpp" />
+    <ClInclude Include="..\..\..\src\tcp.hpp" />
     <ClInclude Include="..\..\..\src\tcp_address.hpp" />
     <ClInclude Include="..\..\..\src\tcp_connecter.hpp" />
     <ClInclude Include="..\..\..\src\tcp_listener.hpp" />

src/ip.cpp

@@ -48,7 +48,7 @@ zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
     fd_t s = socket (domain_, type_, protocol_);
 #ifdef ZMQ_HAVE_WINDOWS
     if (s == INVALID_SOCKET)
-        return INVALID_SOCKET
+        return INVALID_SOCKET;
 #else
     if (s == -1)
         return -1;