From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 Jun 2014 14:30:49 +0000 (-0700)
Subject: Windows: rename TcpLogger::connect
X-Git-Tag: SQUID_3_5_0_1~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4c669ca72b1b4d10f4344ecec46c2806e674ab5;p=thirdparty%2Fsquid.git

Windows: rename TcpLogger::connect

Windows sockets API is mapped via #define macros. connect() macro and
this TcpLogger method collide. Rename the method doConnect().
---

diff --git a/src/log/TcpLogger.cc b/src/log/TcpLogger.cc
index cd539b4d96..e7db7c86f0 100644
--- a/src/log/TcpLogger.cc
+++ b/src/log/TcpLogger.cc
@@ -58,7 +58,7 @@ Log::TcpLogger::~TcpLogger()
 void
 Log::TcpLogger::start()
 {
-    connect();
+    doConnect();
 }
 
 bool
@@ -231,7 +231,7 @@ Log::TcpLogger::appendChunk(const char *chunk, const size_t len)
 
 /// starts [re]connecting to the remote logger
 void
-Log::TcpLogger::connect()
+Log::TcpLogger::doConnect()
 {
     if (shutting_down)
         return;
@@ -313,7 +313,7 @@ Log::TcpLogger::delayedReconnect()
     Must(reconnectScheduled);
     Must(!conn);
     reconnectScheduled = false;
-    connect();
+    doConnect();
 }
 
 /// Comm::Write callback
@@ -328,7 +328,7 @@ Log::TcpLogger::writeDone(const CommIoCbParams &io)
         debugs(MY_DEBUG_SECTION, 2, "write failure: " << xstrerr(io.xerrno));
         // keep the first buffer (the one we failed to write)
         disconnect();
-        connect();
+        doConnect();
     } else {
         debugs(MY_DEBUG_SECTION, 5, "write successful");
 
diff --git a/src/log/TcpLogger.h b/src/log/TcpLogger.h
index 3cfcaf57b0..91efc22c11 100644
--- a/src/log/TcpLogger.h
+++ b/src/log/TcpLogger.h
@@ -64,7 +64,7 @@ private:
     void appendChunk(const char *chunk, const size_t len);
     void writeIfNeeded();
     void writeIfPossible();
-    void connect();
+    void doConnect();
     void disconnect();
 
     /* comm callbacks */