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

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 634b9f1d7455eb2620657c55dd486e057c2afd5f..2617650ecb5e0bb242cf2c461cd1f4b3cf616fc6 100644 (file)
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -339,7 +339,7 @@ Comm::ConnOpener::connect()
 
         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 @@ Comm::ConnOpener::connect()
 
 /// Close and wait a little before trying to open and connect again.
 void
-Comm::ConnOpener::sleep()
+Comm::ConnOpener::retrySleep()
 {
     Must(!calls_.sleep_);
     closeFd();

diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index 8769f615b8be91e6a6069c5dd46bdac767b7c325..f4dce459de89adc958557348f2869ee79ba31624 100644 (file)
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -47,7 +47,7 @@ private:
     void connected();
     void lookupLocalAddress();
 
-    void sleep();
+    void retrySleep();
     void restart();
 
     bool createFd();