Re: cvs commit: squid3/src/ICAP ICAPConfig.cc ICAPConfig.h ....

Alex Rousskov wrote:
> On Sat, 2007-05-19 at 02:38 +1200, Amos Jeffries wrote:
>
>> Oh dear I was sure y test build had --enable-icap.
>> Seems not though, very sorry.
>
> Blame evil #ifdefs!
>

I was going to, then I looked at the code more.
I can't see _any_ in that file file.

I'm using the same g++ 4.1.2 on ubuntu.

I just purged all the build created files, bootstrapped, configured with
"--enable-icap" and rebuilt. (Am I missing an compile option for Xaction?)

It still has not compiled the parts of code that these errors occur in
and I cannot see any OS-specific directives in those files.
I have even added a predirective "#error cvs conflict" to stop the
compiles if it runs on that code ... and nothing appears.

Tried make check. make all, make install. nothing.

>>> Index: ICAP/ICAPXaction.cc
>>> ===================================================================
>>> RCS file: /squid/squid3/src/ICAP/ICAPXaction.cc,v
>>> retrieving revision 1.16
>>> diff -u -r1.16 ICAPXaction.cc
>>> --- ICAP/ICAPXaction.cc 18 May 2007 06:41:30 -0000 1.16
>>> +++ ICAP/ICAPXaction.cc 18 May 2007 08:35:46 -0000
>> <snip>
>>
>>> @@ -118,14 +118,10 @@
>>>
>>> disableRetries(); // we only retry pconn failures
>>>
>>> -<<<<<<< ICAPXaction.cc
>>> if (connection < 0) {
>>> connection = comm_open(SOCK_STREAM, 0, getOutgoingAddr(NULL), 0,
>>> COMM_NONBLOCKING, s.uri.c_str());
>>> -=======
>>> - connection = comm_open(SOCK_STREAM, 0, getOutgoingAddr(NULL), 0,
>>> - COMM_NONBLOCKING, s.uri.buf());
>>> ->>>>>>> 1.15
>>> + }
>> This change is more of a problem. To me it looks like the latter bit
>> that you have removed is part of a previous conflict that got overlooked.
>>
>> ALEX: am I right in thinking the part _after_ the ==== is the new piece
>> that should be kept after converting to use c_str()?
>
> Yes, I think you are right.
>
> Thank you,
>
> Alex.
>

Okay, I am preparing an update for HEAD with the code corrected. But
would still like to find out what the evil #ifefs or their cousins are
doing for future reference.

Amos
Received on Fri May 18 2007 - 09:33:25 MDT