[pkgsrc/trunk]: pkgsrc/devel/libnet11 Fix messed up inline usage.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ef78b63f965
branches:  trunk
changeset: 603352:7ef78b63f965
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 04 16:11:02 2012 +0000

description:
Fix messed up inline usage.

diffstat:

 devel/libnet11/distinfo                               |   5 +++--
 devel/libnet11/patches/patch-aa                       |  16 +++++++++++++---
 devel/libnet11/patches/patch-src_libnet__build__gre.c |  13 +++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r a1384439bcf8 -r 7ef78b63f965 devel/libnet11/distinfo
--- a/devel/libnet11/distinfo   Fri May 04 16:08:49 2012 +0000
+++ b/devel/libnet11/distinfo   Fri May 04 16:11:02 2012 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/02/18 18:31:00 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2012/05/04 16:11:02 joerg Exp $
 
 SHA1 (libnet-1.1.2.1.tar.gz) = 760783a2adbd845b731e2000aafa3cd9c3b028d5
 RMD160 (libnet-1.1.2.1.tar.gz) = 2d8d87930d09a74ab369bd7c240af4b5426ae380
 Size (libnet-1.1.2.1.tar.gz) = 1021236 bytes
-SHA1 (patch-aa) = cac87f7ede65258eb672fbeb8923841aa0d87135
+SHA1 (patch-aa) = 1756f4b78b60c2e5bb71d51f8128481999897426
 SHA1 (patch-ab) = 70a38d114f9d3a4e08cb55af5d3645b92526cdbb
+SHA1 (patch-src_libnet__build__gre.c) = fed914e913a361b615a62bba2dd2787bb5fa6f65
diff -r a1384439bcf8 -r 7ef78b63f965 devel/libnet11/patches/patch-aa
--- a/devel/libnet11/patches/patch-aa   Fri May 04 16:08:49 2012 +0000
+++ b/devel/libnet11/patches/patch-aa   Fri May 04 16:11:02 2012 +0000
@@ -1,9 +1,19 @@
-$NetBSD: patch-aa,v 1.1 2007/02/09 23:58:24 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/04 16:11:02 joerg Exp $
 
+libnet_getgre_length is used by different TUs, so it certainly is not inline.
 void foo() is different from void foo(void), at least in C.
 
---- include/libnet/libnet-functions.h.orig     2004-03-25 19:50:48.000000000 +0100
-+++ include/libnet/libnet-functions.h  2007-02-10 00:55:20.000000000 +0100
+--- include/libnet/libnet-functions.h.orig     2004-03-25 18:50:48.000000000 +0000
++++ include/libnet/libnet-functions.h
+@@ -1429,7 +1429,7 @@ libnet_t *l, libnet_ptag_t ptag);
+  * @param ptag protocol tag to modify an existing header, 0 to build a new one
+  * @return protocol tag value on success, -1 on error
+  */
+-inline u_int32_t
++u_int32_t
+ libnet_getgre_length(u_int16_t fv);
+ 
+ /**
 @@ -1837,7 +1837,7 @@ libnet_cq_find_by_label(char *label);
   * member context.
   */
diff -r a1384439bcf8 -r 7ef78b63f965 devel/libnet11/patches/patch-src_libnet__build__gre.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libnet11/patches/patch-src_libnet__build__gre.c     Fri May 04 16:11:02 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_libnet__build__gre.c,v 1.1 2012/05/04 16:11:02 joerg Exp $
+
+--- src/libnet_build_gre.c.orig        2012-04-27 15:03:53.000000000 +0000
++++ src/libnet_build_gre.c
+@@ -138,7 +138,7 @@ __libnet_print_gre_flags_ver(u_int16_t f
+ 
+ 
+ /* FIXME: what is the portability of the "((struct libnet_gre_hdr*)0)->" ? */
+-inline u_int32_t
++u_int32_t
+ libnet_getgre_length(u_int16_t fv)
+ {
+