Re: [PATCH] remove squid-old.h

On 16/08/2012 6:56 p.m., Kinkie wrote:
>> I am guessing this is the patch that broke build in numerous places. I
>> am surprised it was not reverted upon the first signs of trouble. Here
>> are some of the errors that I see:
> Prior to committing I have run a test-builds.sh on my kubuntu machine
> and it turned out fine; apparently the more recent kernel and/or glibc
> and/or gcc triggers some more permissive include paths.
>
>>> helper.cc: In member function ‘void Ssl::Helper::Init()’:
>>> helper.cc:54: error: ‘strwordtok’ was not declared in this scope
>>> helper.cc:55: error: ‘wordlistAdd’ was not declared in this scope
>>> helper.cc:68: error: ‘wordlistAdd’ was not declared in this scope
>>> helper.cc: In member function ‘void Ssl::Helper::Shutdown()’:
>>> helper.cc:81: error: ‘wordlistDestroy’ was not declared in this scope
>>> MessageRep.cc: In member function ‘virtual void Adaptation::Ecap::RequestLineRep::uri(const libecap::Area&)’:
>>> MessageRep.cc:210: error: ‘urlParse’ was not declared in this scope
>>> MessageRep.cc: In member function ‘virtual libecap::Area Adaptation::Ecap::RequestLineRep::uri() const’:
>>> MessageRep.cc:218: error: ‘urlCanonical’ was not declared in this scope
>>> ServiceRep.cc: In member function ‘virtual void Adaptation::Ecap::ServiceRep::finalize()’:
>>> ServiceRep.cc:114: error: ‘DBG_IMPORTANT’ was not declared in this scope
>>> ServiceRep.cc:114: error: no match for ‘operator<<’ in ‘"WARNING: configured ...
>>
>> And in one of the fixes that followed:
>>
>>> +/* must be before including netfilter_ipv4.h */
>>> +#if HAVE_LIMITS_H
>>> +#include <limits.h>
>>> +#endif
>>> #if LINUX_NETFILTER
>>> #include <linux/netfilter_ipv4.h>
>>> #endif
>> If limits.h is needed for linux/netfilter_ipv4.h only, it should be
>> included inside LINUX_NETFILTER clause.
> Both are inside a a #if IPF_TRANSPARENT , so it is already
> conditionally included depending on the features being built. But I
> see your point, and I'll change accordingly.
>
>

No, there is a three-way structure to those includes:

#if IPF_TRANSPARENT
... headers
#endif /* IPF_TRANSPARENT required headers */

#if PF_TRANSPARENT
... headers
#endif /* PF_TRANSPARENT required headers */

#if LINUX_NETFILTER
... headers
#endif

Amos
Received on Thu Aug 16 2012 - 07:09:57 MDT