Fix inline usage.

4 files changed, 54 insertions, 3 deletions

diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 185d86033e5..a8134b2aaae 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2012/03/03 12:54:20 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2012/04/17 17:45:35 joerg Exp $
 #
 
 DISTNAME=	libnids-1.23
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libnids/}
 
diff --git a/net/libnids/distinfo b/net/libnids/distinfo
index 3e203b7a435..d930822f42b 100644
--- a/net/libnids/distinfo
+++ b/net/libnids/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2011/11/26 17:17:53 joerg Exp $
+$NetBSD: distinfo,v 1.11 2012/04/17 17:45:35 joerg Exp $
 
 SHA1 (libnids-1.23.tar.gz) = 105bff0d0d35ab95ec90cce98cfb409f64ed44b4
 RMD160 (libnids-1.23.tar.gz) = 38994ad04f688291315bfcde38d8795e7a4c4226
 Size (libnids-1.23.tar.gz) = 140975 bytes
 SHA1 (patch-src_killtcp.c) = 77977d660cb55405b3501375185200bc37b702b1
+SHA1 (patch-src_util.c) = 1308beb64054caadb69ac7ba4e82b4bd15d07a4b
+SHA1 (patch-src_util.h) = 808a0b9e926ac3aab753123b621933c85797e643
diff --git a/net/libnids/patches/patch-src_util.c b/net/libnids/patches/patch-src_util.c
new file mode 100644
index 00000000000..5c8c3cc5a76
--- /dev/null
+++ b/net/libnids/patches/patch-src_util.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_util.c,v 1.1 2012/04/17 17:45:36 joerg Exp $
+
+--- src/util.c.orig	2012-04-16 22:20:17.000000000 +0000
++++ src/util.c
+@@ -29,18 +29,6 @@ test_malloc(int x)
+   return ret;
+ }
+ 
+-inline int
+-before(u_int seq1, u_int seq2)
+-{
+-  return ((int)(seq1 - seq2) < 0);
+-}
+-
+-inline int
+-after(u_int seq1, u_int seq2)
+-{
+-  return ((int)(seq2 - seq1) < 0);
+-}
+-
+ void
+ register_callback(struct proc_node **procs, void (*x))
+ {
diff --git a/net/libnids/patches/patch-src_util.h b/net/libnids/patches/patch-src_util.h
new file mode 100644
index 00000000000..7cc83111d7b
--- /dev/null
+++ b/net/libnids/patches/patch-src_util.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_util.h,v 1.1 2012/04/17 17:45:36 joerg Exp $
+
+--- src/util.h.orig	2012-04-16 22:20:32.000000000 +0000
++++ src/util.h
+@@ -23,9 +23,19 @@ struct lurker_node {
+ 
+ void nids_no_mem(char *);
+ char *test_malloc(int);
+-inline int before(u_int seq1, u_int seq2);
+-inline int after(u_int seq1, u_int seq2);
+ void register_callback(struct proc_node **procs, void (*x));
+ void unregister_callback(struct proc_node **procs, void (*x));
+ 
++static inline int
++before(u_int seq1, u_int seq2)
++{
++  return ((int)(seq1 - seq2) < 0);
++}
++
++static inline int
++after(u_int seq1, u_int seq2)
++{
++  return ((int)(seq2 - seq1) < 0);
++}
++
+ #endif /* _NIDS_UTIL_H */