Fix to compilation problem with new headers from 2.6.18 kernel.

Need to ensure that __always_inline is defined.

diff --git a/ipset/ipset.c b/ipset/ipset.c
index adf37b1..f4dda0d 100644 (file)
--- a/ipset/ipset.c
+++ b/ipset/ipset.c
@@ -21,6 +21,9 @@
 #include <stdarg.h>
 #include <netdb.h>
 #include <dlfcn.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 
 #include "ipset.h"

diff --git a/ipset/ipset_iphash.c b/ipset/ipset_iphash.c
index 3272e6e..80944d7 100644 (file)
--- a/ipset/ipset_iphash.c
+++ b/ipset/ipset_iphash.c
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 #include <asm/types.h>
 

diff --git a/ipset/ipset_ipmap.c b/ipset/ipset_ipmap.c
index 2d1c81c..b170be2 100644 (file)
--- a/ipset/ipset_ipmap.c
+++ b/ipset/ipset_ipmap.c
@@ -22,6 +22,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 
 #include <linux/netfilter_ipv4/ip_set_ipmap.h>

diff --git a/ipset/ipset_ipporthash.c b/ipset/ipset_ipporthash.c
index 1ebbc50..4474985 100644 (file)
--- a/ipset/ipset_ipporthash.c
+++ b/ipset/ipset_ipporthash.c
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 #include <asm/types.h>
 

diff --git a/ipset/ipset_macipmap.c b/ipset/ipset_macipmap.c
index 3ef8fb1..8483048 100644 (file)
--- a/ipset/ipset_macipmap.c
+++ b/ipset/ipset_macipmap.c
@@ -24,6 +24,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 #include <linux/if_ether.h>
 

diff --git a/ipset/ipset_nethash.c b/ipset/ipset_nethash.c
index 758c4c1..79f7417 100644 (file)
--- a/ipset/ipset_nethash.c
+++ b/ipset/ipset_nethash.c
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 #include <asm/types.h>
 

diff --git a/ipset/ipset_portmap.c b/ipset/ipset_portmap.c
index 1c3965b..cdad439 100644 (file)
--- a/ipset/ipset_portmap.c
+++ b/ipset/ipset_portmap.c
@@ -21,6 +21,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef __always_inline
+#define __always_inline inline
+#endif
 #include <asm/bitops.h>
 
 #include <linux/netfilter_ipv4/ip_set_portmap.h>