------------------------------------------------------------
revno: 12615
revision-id: squid3@treenet.co.nz-20130910113013-epwx2wqqn2z6whxr
parent: squid3@treenet.co.nz-20130910112859-905v69q9b6ql8o5l
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2013-09-10 05:30:13 -0600
message:
  Windows: Fix ConnOpener::sleep() collision with global macro
  
  Squid compat library defines sleep() as a wrapper macro which 
  collides with the member definition in Comm::ConnOpener.
  
   This is an iCelero project
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130910113013-epwx2wqqn2z6whxr
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: f54c314d01686014e14129cd1a9cf8fedd34b4b7
# timestamp: 2013-09-10 11:53:45 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130910112859-\
#   905v69q9b6ql8o5l
# 
# Begin patch
=== modified file 'src/comm/ConnOpener.cc'
--- src/comm/ConnOpener.cc	2013-03-01 10:04:57 +0000
+++ src/comm/ConnOpener.cc	2013-09-10 11:30:13 +0000
@@ -339,7 +339,7 @@
 
         if (failRetries_ < Config.connect_retries) {
             debugs(5, 5, HERE << conn_ << ": * - try again");
-            sleep();
+            retrySleep();
             return;
         } else {
             // send ERROR back to the upper layer.
@@ -352,7 +352,7 @@
 
 /// Close and wait a little before trying to open and connect again.
 void
-Comm::ConnOpener::sleep()
+Comm::ConnOpener::retrySleep()
 {
     Must(!calls_.sleep_);
     closeFd();

=== modified file 'src/comm/ConnOpener.h'
--- src/comm/ConnOpener.h	2013-02-03 14:03:29 +0000
+++ src/comm/ConnOpener.h	2013-09-10 11:30:13 +0000
@@ -47,7 +47,7 @@
     void connected();
     void lookupLocalAddress();
 
-    void sleep();
+    void retrySleep();
     void restart();
 
     bool createFd();