1 files changed, 4 insertions, 14 deletions
diff --git a/src/signaler.hpp b/src/signaler.hpp
index 3e5ff13..faf3f1f 100644
--- a/src/signaler.hpp
+++ b/src/signaler.hpp
@@ -44,24 +44,14 @@ namespace zmq
         
     private:
 
-#if defined ZMQ_HAVE_OPENVMS
-
-        //  Whilst OpenVMS supports socketpair - it maps to AF_INET only.
-        //  Further, it does not set the socket options TCP_NODELAY and
-        //  TCP_NODELACK which can lead to performance problems. We'll
-        //  overload the socketpair function for this class.
-        //
-        //  The bug will be fixed in V5.6 ECO4 and beyond.  In the
-        //  meantime, we'll create the socket pair manually.
-        static int socketpair (int domain_, int type_, int protocol_,
-            int sv_ [2]);
-#endif
-
         //  Write & read end of the socketpair.
         fd_t w;
         fd_t r;
 
-        //  Disable copying of fd_signeler object.
+        //  Platform-dependent function to create a socketpair.
+        static int make_socketpair (fd_t *r_, fd_t *w_);
+
+        //  Disable copying of signaler_t object.
         signaler_t (const signaler_t&);
         void operator = (const signaler_t&);
     };