1 Index: squid/src/client_side.c
2 diff -c squid/src/client_side.c:1.561.2.80 squid/src/client_side.c:1.561.2.82
3 *** squid/src/client_side.c:1.561.2.80 Thu Jun 30 02:38:00 2005
4 --- squid/src/client_side.c Fri Aug 19 03:17:55 2005
9 #include <netinet/tcp.h>
12 + * Workaround needed to allow the build of both ipfilter and ARP acl
13 + * support on Solaris x86.
15 + * Some defines, like
17 + * are used in squid.h to block misuse of standard malloc routines
18 + * where the Squid versions should be used. This pollutes the C/C++
19 + * token namespace crashing any structures or classes having members
20 + * of the same names.
22 + #ifdef _SQUID_SOLARIS_
25 #if HAVE_IP_FIL_COMPAT_H
26 #include <ip_fil_compat.h>
27 #elif HAVE_NETINET_IP_FIL_COMPAT_H