On 10/02/2011 08:53 AM, Jan Engelhardt wrote: > On Saturday 2011-10-01 19:54, Anthony G. Basile wrote: > >> As an appendix to this patch, let me add a couple of points: >> >> 1) In the union, >> >>> +union nf_conntrack_man_proto { >>> + __be16 all; >>> + __be16 port; >>> + __be16 icmp_idnt; >>> + __be16 gre_key; >>> +}; >> >> I named the one member icmp_idnt to avoid a name collision with "#define >> icmp_id ..." in <netinet/ip_icmp.h>. This causes problems in both >> iptables and miniupnpd. > > Wow that's a horrible thing to do of ip_icmp.h. Such #defines should die > because their scope is way too broad. I know. I hate it too, and it was not easy to catch. But how else do we get around it? We could do an undef, but that's just as ugly. -- Anthony G. Basile, Ph. D. Chair of Information Technology D'Youville College Buffalo, NY 14201 (716) 829-8197 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html