Just add the two ifdefs at the end of that struct, ie: #if FD_CONFIG int max_filedesc; #endif #ifdef HS_FEAT_ICAP IcapConfig icapcfg; #endif On Thu, Jan 18, 2007, Eric.chen wrote: > > > Dear all > > i want to use squid2.6.stable7.src.rpm and added the icap patch > http://people.redhat.com/stransky/squid/ > > but the icap.patch collides with squid-2.6.STABLE5-fd-config.patch > > can any one to help me how to fix icap2.6.patch > > > in the squid-2.6.STABLE5-fd-config.patch > ============================================================== > --- squid-2.6.STABLE1/src/structs.h.fd 2006-07-26 09:58:41.000000000 +0200 > +++ squid-2.6.STABLE1/src/structs.h 2006-07-26 09:58:41.000000000 +0200 > @@ -805,6 +805,9 @@ > #endif > time_t refresh_stale_window; > int umask; > +#if FD_CONFIG > + int max_filedesc; > +#endif > }; > ============================================================== > > in the icap-2.6.patch > ===================================================== > @@ -810,6 +827,9 @@ > #endif > time_t refresh_stale_window; > int umask; > +#ifdef HS_FEAT_ICAP > + IcapConfig icapcfg; > +#endif > }; > ===================================================== -- - Xenion - http://www.xenion.com.au/ - VPS Hosting - Commercial Squid Support - - $25/pm entry-level bandwidth-capped VPSes available in WA -
