------------------------------------------------------------
revno: 12353
revision-id: squid3@treenet.co.nz-20121010014817-89wgt1ih54m3ko4b
parent: squid3@treenet.co.nz-20121010013755-7ig0ushg0h53y661
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2012-10-09 19:48:17 -0600
message:
  Portability: change Ipc::Port::listen to doListen()
  
  listen() clashes with POSIX function of the same name.
  Some systems (ie MinGW) define it as a macro wrapper.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121010014817-89wgt1ih54m3ko4b
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 4de89953944018efb0ba171babbbaeae7f7bc27e
# timestamp: 2012-10-10 01:52:32 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121010013755-\
#   7ig0ushg0h53y661
# 
# Begin patch
=== modified file 'src/ipc/Port.cc'
--- src/ipc/Port.cc	2012-09-01 14:38:36 +0000
+++ src/ipc/Port.cc	2012-10-10 01:48:17 +0000
@@ -21,10 +21,10 @@
 void Ipc::Port::start()
 {
     UdsOp::start();
-    listen();
+    doListen();
 }
 
-void Ipc::Port::listen()
+void Ipc::Port::doListen()
 {
     debugs(54, 6, HERE);
     buf.prepForReading();
@@ -60,5 +60,5 @@
     // TODO: if there was a fatal error on our socket, close the socket before
     // trying to listen again and print a level-1 error message.
 
-    listen();
+    doListen();
 }

=== modified file 'src/ipc/Port.h'
--- src/ipc/Port.h	2012-09-01 14:38:36 +0000
+++ src/ipc/Port.h	2012-10-10 01:48:17 +0000
@@ -25,7 +25,7 @@
     virtual bool doneAll() const; // UdsOp (AsyncJob) API
 
     /// read the next incoming message
-    void listen();
+    void doListen();
 
     /// handle IPC message just read
     virtual void receive(const TypedMsgHdr& message) = 0;