don't inline a function in one source file and expect to be able to

use it in other source files - not all compilers allow this.

3 files changed, 29 insertions, 1 deletions

diff --git a/security/rid/distinfo b/security/rid/distinfo
index 9c072a35225..b049dc2ce53 100644
--- a/security/rid/distinfo
+++ b/security/rid/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/06/27 12:21:21 grant Exp $
 
 SHA1 (rid-1.11.tgz) = 14ccad3ae413a1bed19ad5f063f8e563b9ddbbfb
 Size (rid-1.11.tgz) = 122317 bytes
+SHA1 (patch-aa) = 8840f22028d1535c54a6dc84caeb1960cb93a5de
+SHA1 (patch-ab) = 863908c0ec660d3976e977888b95061cac63fe41
diff --git a/security/rid/patches/patch-aa b/security/rid/patches/patch-aa
new file mode 100644
index 00000000000..b318ab495d4
--- /dev/null
+++ b/security/rid/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/06/27 12:21:21 grant Exp $
+
+--- functions.h.orig	2000-02-27 13:37:36.000000000 +1100
++++ functions.h
+@@ -6,7 +6,7 @@ void add_ip(char *ip);
+ int add_ips(char *ip, int mask);
+ void pingsweep(int numhosts);
+ void process_alive(int num_hosts);
+-inline unsigned short ip_cksum(u_short *addr, int len);
++unsigned short ip_cksum(u_short *addr, int len);
+ void printlist();
+ void icmp_send();
+ void udp_send();
diff --git a/security/rid/patches/patch-ab b/security/rid/patches/patch-ab
new file mode 100644
index 00000000000..c8ea9c75bd0
--- /dev/null
+++ b/security/rid/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/06/27 12:21:21 grant Exp $
+
+--- pinger.c.orig	2000-02-25 15:33:24.000000000 +1100
++++ pinger.c
+@@ -141,7 +141,7 @@ void process_alive(int num_hosts)
+ }
+ 
+ /* Standard checksum routine */
+-inline unsigned short
++unsigned short
+ ip_cksum(u_short *addr, int len)
+ {
+         register int    nleft = len;