ZMQII-1: Win32 - failure on shutdown

4 files changed, 9 insertions, 3 deletions

diff --git a/java/Socket.cpp b/java/Socket.cpp
index a7b2fe5..2a2f420 100644
--- a/java/Socket.cpp
+++ b/java/Socket.cpp
@@ -22,6 +22,8 @@
 #include <assert.h>
 #include <errno.h>
 
+#include "../src/stdint.hpp"
+
 #include "zmq.h"
 #include "org_zmq_Socket.h"
 
diff --git a/msvc/libzmq/libzmq.vcproj b/msvc/libzmq/libzmq.vcproj
index 27986d4..697b75f 100644
--- a/msvc/libzmq/libzmq.vcproj
+++ b/msvc/libzmq/libzmq.vcproj
@@ -230,6 +230,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\pub.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\select.cpp"
 				>
 			</File>
diff --git a/src/select.cpp b/src/select.cpp
index f10acdc..cb17169 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -53,10 +53,10 @@ zmq::select_t::select_t () :
 
 zmq::select_t::~select_t ()
 {
+    worker.stop ();
+
     //  Make sure there are no fds registered on shutdown.
     zmq_assert (load.get () == 0);
-
-    worker.stop ();
 }
 
 zmq::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 0429726..51649fb 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -281,7 +281,7 @@ int zmq::socket_base_t::connect (const char *addr_)
 #endif
 
     //  Unknown address type.
-    errno = ENOTSUP;
+    errno = EFAULT;
     return -1;
 }