From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 9 Jun 2014 13:32:43 +0000 (-0700)
Subject: Windows: rename ConnOpener::connect
X-Git-Tag: SQUID_3_5_0_1~186
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d7ecaffc40b198628a4e96767e4a65750321e3b;p=thirdparty%2Fsquid.git

Windows: rename ConnOpener::connect

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

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 383f616593..493cfe8b4d 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -228,7 +228,7 @@ Comm::ConnOpener::start()
     }
 
     if (createFd())
-        connect();
+        doConnect();
 }
 
 /// called at the end of Comm::ConnOpener::DelayedConnectRetry event
@@ -239,7 +239,7 @@ Comm::ConnOpener::restart()
     calls_.sleep_ = false;
 
     if (createFd())
-        connect();
+        doConnect();
 }
 
 /// Create a socket for the future connection or return false.
@@ -309,7 +309,7 @@ Comm::ConnOpener::connected()
 
 /// Make an FD connection attempt.
 void
-Comm::ConnOpener::connect()
+Comm::ConnOpener::doConnect()
 {
     Must(conn_ != NULL);
     Must(temporaryFd_ >= 0);
diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index 739443ba89..e553b36986 100644
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -43,7 +43,7 @@ private:
     void sendAnswer(Comm::Flag errFlag, int xerrno, const char *why);
     static void InProgressConnectRetry(int fd, void *data);
     static void DelayedConnectRetry(void *data);
-    void connect();
+    void doConnect();
     void connected();
     void lookupLocalAddress();