------------------------------------------------------------
revno: 13049
revision-id: squid3@treenet.co.nz-20131206121622-dpuipsixoqgr5h2s
parent: squid3@treenet.co.nz-20131206121554-ivl5iwvm342lrnek
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2013-12-06 05:16:22 -0700
message:
  Portability: sleep() is sometimes a macro
  
  sleep() is sometimes defined as a macro. Such as in Squid compat library.
  Use another name for the sleep starting method in class Ipc::UdsOp
  
    This is an iCelero Project
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131206121622-dpuipsixoqgr5h2s
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 8869cf89f0a33f124aeab434c00a666dd664de53
# timestamp: 2013-12-06 12:23:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131206121554-\
#   ivl5iwvm342lrnek
# 
# Begin patch
=== modified file 'src/ipc/UdsOp.cc'
--- src/ipc/UdsOp.cc	2013-11-10 23:01:35 +0000
+++ src/ipc/UdsOp.cc	2013-12-06 12:16:22 +0000
@@ -126,12 +126,12 @@
     if (params.flag != COMM_OK && retries-- > 0) {
         // perhaps a fresh connection and more time will help?
         conn()->close();
-        sleep();
+        startSleep();
     }
 }
 
 /// pause for a while before resending the message
-void Ipc::UdsSender::sleep()
+void Ipc::UdsSender::startSleep()
 {
     Must(!sleeping);
     sleeping = true;

=== modified file 'src/ipc/UdsOp.h'
--- src/ipc/UdsOp.h	2013-11-10 23:01:35 +0000
+++ src/ipc/UdsOp.h	2013-12-06 12:16:22 +0000
@@ -71,7 +71,7 @@
     virtual void timedout(); // UdsOp API
 
 private:
-    void sleep();
+    void startSleep();
     void cancelSleep();
     static void DelayedRetry(void *data);
     void delayedRetry();