Year 2007.

[metaproxy-moved-to-github.git] / src / pipe.cpp

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 227f31d..3a05896 100644 (file)
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,8 +1,7 @@
+/* $Id: pipe.cpp,v 1.9 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-/* $Id: pipe.cpp,v 1.3 2005-11-07 22:43:17 adam Exp $
-   Copyright (c) 2005, Index Data.
-
-%LICENSE%
+   See the LICENSE file for details
  */
 #include "config.hpp"
 
@@ -37,12 +36,14 @@
 
 #include <deque>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "pipe.hpp"
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class Pipe::Rep : public boost::noncopyable {
         friend class Pipe;
         Rep();
@@ -53,7 +54,7 @@ namespace yp2 {
     };
 }
 
-using namespace yp2;
+using namespace mp;
 
 void Pipe::Rep::close(int &fd)
 {
@@ -91,6 +92,12 @@ bool Pipe::Rep::nonblock(int s)
 
 Pipe::Pipe(int port_to_use) : m_p(new Rep)
 {
+#ifdef WIN32
+    WSADATA wsaData;
+    WORD wVersionRequested = MAKEWORD(2, 0);
+    if (WSAStartup( wVersionRequested, &wsaData ))
+        throw Pipe::Error("WSAStartup failed");
+#endif
     if (port_to_use)
     {
         // create server socket
@@ -175,6 +182,9 @@ Pipe::~Pipe()
     m_p->close(m_p->m_fd[0]);
     m_p->close(m_p->m_fd[1]);
     m_p->close(m_p->m_socket);
+#ifdef WIN32
+    WSACleanup();
+#endif
 }
 
 int &Pipe::read_fd() const