tags 777907 + patch
thanks
Here's a fix for the GCC 5 build issue. Removed "extern" from
inline functions in hunt.h. The package builds and links with GCC 5 with
this change.
Upstream may prefer to move to C99 instead, please see section
"Different semantics for inline functions" at
https://gcc.gnu.org/gcc-5/porting_to.html for more background.
--
Nicholas Luedtke
Linux for HP Helion OpenStack, Hewlett-Packard
--- ../hunt.h 2015-07-15 20:47:03.634664806 +0000
+++ hunt.h 2015-07-15 20:47:43.506664459 +0000
@@ -291,20 +291,20 @@
#define TCP_HDR_LENGTH(tcph) ((tcph)->doff << 2)
-extern inline unsigned int generate_key(unsigned long saddr, unsigned long daddr,
+inline unsigned int generate_key(unsigned long saddr, unsigned long daddr,
unsigned short source, unsigned short dest)
{
return saddr + daddr + source + dest;
}
#if 0
-extern inline unsigned int generate_key_from_packet(struct packet *p)
+inline unsigned int generate_key_from_packet(struct packet *p)
{
return generate_key(ntohl(p->p_iph->saddr), ntohl(p->p_iph->daddr),
ntohs(p->p_hdr.p_tcph->source), ntohs(p->p_hdr.p_tcph->dest));
}
#endif
-extern inline unsigned int uci_generate_key(struct user_conn_info *uci)
+inline unsigned int uci_generate_key(struct user_conn_info *uci)
{
return generate_key(ntohl(uci->src_addr), ntohl(uci->dst_addr),
ntohs(uci->src_port), ntohs(uci->dst_port));
