From cc3755a16f00026af882ed14d122cc8aa6d50e82 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.commkdir>
Date: Mon, 3 Aug 2009 11:30:13 +0200
Subject: renamed from zs to zmq

---
 src/tcp_connecter.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/tcp_connecter.cpp')

diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index 6b59290..7d29019 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -22,7 +22,7 @@
 #include "ip.hpp"
 #include "err.hpp"
 
-#ifdef ZS_HAVE_WINDOWS
+#ifdef ZMQ_HAVE_WINDOWS
 
 #include "windows.hpp"
 #error
@@ -37,20 +37,20 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-zs::tcp_connecter_t::tcp_connecter_t () :
+zmq::tcp_connecter_t::tcp_connecter_t () :
     s (retired_fd)
 {
 }
 
-zs::tcp_connecter_t::~tcp_connecter_t ()
+zmq::tcp_connecter_t::~tcp_connecter_t ()
 {
     if (s != retired_fd)
         close ();
 }
 
-int zs::tcp_connecter_t::open (const char *addr_)
+int zmq::tcp_connecter_t::open (const char *addr_)
 {
-    zs_assert (s == retired_fd);
+    zmq_assert (s == retired_fd);
 
     //  Convert the hostname into sockaddr_in structure.
     sockaddr_in address;
@@ -75,7 +75,7 @@ int zs::tcp_connecter_t::open (const char *addr_)
     rc = setsockopt (s, IPPROTO_TCP, TCP_NODELAY, (char*) &flag, sizeof (int));
     errno_assert (rc == 0);
 
-#ifdef ZS_HAVE_OPENVMS
+#ifdef ZMQ_HAVE_OPENVMS
     //  Disable delayed acknowledgements.
     flag = 1;
     rc = setsockopt (s, IPPROTO_TCP, TCP_NODELACK, (char*) &flag, sizeof (int));
@@ -100,9 +100,9 @@ int zs::tcp_connecter_t::open (const char *addr_)
     return -1;
 }
 
-int zs::tcp_connecter_t::close ()
+int zmq::tcp_connecter_t::close ()
 {
-    zs_assert (s != retired_fd);
+    zmq_assert (s != retired_fd);
     int rc = ::close (s);
     if (rc != 0)
         return -1;
@@ -110,12 +110,12 @@ int zs::tcp_connecter_t::close ()
     return 0;
 }
 
-zs::fd_t zs::tcp_connecter_t::get_fd ()
+zmq::fd_t zmq::tcp_connecter_t::get_fd ()
 {
     return s;
 }
 
-zs::fd_t zs::tcp_connecter_t::connect ()
+zmq::fd_t zmq::tcp_connecter_t::connect ()
 {
     //  Following code should handle both Berkeley-derived socket
     //  implementations and Solaris.
-- 
cgit v1.2.3