net-tools: add a patch to avoid struct redefinition
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>
Thu, 3 Nov 2016 13:25:46 +0000 (13:25 +0000)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 3 Nov 2016 21:17:17 +0000 (22:17 +0100)
commit108b9c1e6b15d74d2e3a3241901fbdaca42df524
tree92867cdce427ac95e942f66d1ef22c92249b4fe5
parentad5cb7474fdaaa60e0a21743d1555f4f69b5b752
net-tools: add a patch to avoid struct redefinition

This fixes a struct redefinition problem like this one:

================================
In file included from /usr/include/linux/if_tunnel.h:6:0,
from iptunnel.c:34:
/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr'
struct iphdr {
^
In file included from iptunnel.c:29:0:
/usr/include/netinet/ip.h:45:8: note: originally defined here
struct iphdr
^
================================

iptunnel.c includes netinet/ip.h which contains a definition of the
iphdr struct.

iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h
which contains a definition of the iphdr struct.

So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both
of them have been included directly or indirectly by iptunnel.c. Because
of that the compilation fails due to a struct redefinition.

The problem can be solved by just not including netinet/ip.h.

The patch has been sent upstream as a merge request:
  https://sourceforge.net/p/net-tools/code/merge-requests/3/

Fixes:
  http://autobuild.buildroot.net/results/dce/dce499da84b2a41bab946d5109a283ccb85c8b81/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch [new file with mode: 0644]