From: Amos Jeffries Date: Wed, 10 Oct 2012 01:48:17 +0000 (-0600) Subject: Portability: change Ipc::Port::listen to doListen() X-Git-Tag: SQUID_3_3_0_1~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cdadbf1d3627c839bf88c363a9512fc40819c32;p=thirdparty%2Fsquid.git 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. --- diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc index 21807b9cba..720625f742 100644 --- a/src/ipc/Port.cc +++ b/src/ipc/Port.cc @@ -21,10 +21,10 @@ Ipc::Port::Port(const String& aListenAddr): 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 @@ void Ipc::Port::noteRead(const CommIoCbParams& params) // 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(); } diff --git a/src/ipc/Port.h b/src/ipc/Port.h index e6d2d2cdb0..9282f2385f 100644 --- a/src/ipc/Port.h +++ b/src/ipc/Port.h @@ -25,7 +25,7 @@ protected: 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;