]>
Commit | Line | Data |
---|---|---|
8e6421d7 MF |
1 | ------------------------------------------------------------ |
2 | revno: 13231 | |
3 | revision-id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm | |
4 | parent: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 | |
5 | fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323 | |
6 | author: Francesco Chemolli <kinkie@squid-cache.org> | |
7 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
8 | branch nick: 3.4 | |
9 | timestamp: Sun 2016-02-21 04:08:59 +1300 | |
10 | message: | |
11 | Bug 4323: Netfilter broken cross-includes with Linux 4.2 | |
12 | ------------------------------------------------------------ | |
13 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
14 | # revision_id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm | |
15 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
16 | # testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3 | |
17 | # timestamp: 2016-02-20 15:50:56 +0000 | |
18 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
19 | # base_revision_id: squid3@treenet.co.nz-20160212045316-\ | |
20 | # zwx4r9we4gf27rx3 | |
21 | # | |
22 | # Begin patch | |
23 | === modified file 'compat/os/linux.h' | |
24 | --- compat/os/linux.h 2012-08-28 13:00:30 +0000 | |
25 | +++ compat/os/linux.h 2016-02-20 15:08:59 +0000 | |
26 | @@ -22,6 +22,21 @@ | |
27 | #endif | |
28 | ||
29 | /* | |
30 | + * Netfilter header madness. (see Bug 4323) | |
31 | + * | |
32 | + * Netfilter have a history of defining their own versions of network protocol | |
33 | + * primitives without sufficient protection against the POSIX defines which are | |
34 | + * aways present in Linux. | |
35 | + * | |
36 | + * netinet/in.h must be included before any other sys header in order to properly | |
37 | + * activate include guards in <linux/libc-compat.h> the kernel maintainers added | |
38 | + * to workaround it. | |
39 | + */ | |
40 | +#if HAVE_NETINET_IN_H | |
41 | +#include <netinet/in.h> | |
42 | +#endif | |
43 | + | |
44 | +/* | |
45 | * sys/capability.h is only needed in Linux apparently. | |
46 | * | |
47 | * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc | |
48 |