------------------------------------------------------------
revno: 13146
revision-id: squid3@treenet.co.nz-20140616024905-gxoxh75e3ixt2hbh
parent: squid3@treenet.co.nz-20140616024716-9sd9haob9uipezvx
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Sun 2014-06-15 20:49:05 -0600
message:
  Windows: rename TcpLogger::connect
  
  Windows sockets API is mapped via #define macros. connect() macro and
  this TcpLogger method collide. Rename the method doConnect().
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140616024905-gxoxh75e3ixt2hbh
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: b8834531475176574df8fb6719b5c5b4916dc2bf
# timestamp: 2014-06-16 02:49:49 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140616024716-\
#   9sd9haob9uipezvx
# 
# Begin patch
=== modified file 'src/log/TcpLogger.cc'
--- src/log/TcpLogger.cc	2013-06-03 14:05:16 +0000
+++ src/log/TcpLogger.cc	2014-06-16 02:49:05 +0000
@@ -58,7 +58,7 @@
 void
 Log::TcpLogger::start()
 {
-    connect();
+    doConnect();
 }
 
 bool
@@ -231,7 +231,7 @@
 
 /// starts [re]connecting to the remote logger
 void
-Log::TcpLogger::connect()
+Log::TcpLogger::doConnect()
 {
     if (shutting_down)
         return;
@@ -313,7 +313,7 @@
     Must(reconnectScheduled);
     Must(!conn);
     reconnectScheduled = false;
-    connect();
+    doConnect();
 }
 
 /// Comm::Write callback
@@ -328,7 +328,7 @@
         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");
 

=== modified file 'src/log/TcpLogger.h'
--- src/log/TcpLogger.h	2013-05-12 00:13:05 +0000
+++ src/log/TcpLogger.h	2014-06-16 02:49:05 +0000
@@ -66,7 +66,7 @@
     void appendChunk(const char *chunk, const size_t len);
     void writeIfNeeded();
     void writeIfPossible();
-    void connect();
+    void doConnect();
     void disconnect();
 
     /* comm callbacks */