Really fix inline usage.

3 files changed, 54 insertions, 6 deletions

diff --git a/net/nfdump/distinfo b/net/nfdump/distinfo
index bf30a7ae799..09b952ef1f9 100644
--- a/net/nfdump/distinfo
+++ b/net/nfdump/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2012/12/26 21:41:52 dholland Exp $
+$NetBSD: distinfo,v 1.8 2013/01/11 13:33:59 joerg Exp $
 
 SHA1 (nfdump-1.6.6.tar.gz) = f7a30c69419222f1527684fb46f02ae757b3dac0
 RMD160 (nfdump-1.6.6.tar.gz) = 63d5aec9e7f6d2ee151a88451e52ac86263996e4
 Size (nfdump-1.6.6.tar.gz) = 651348 bytes
-SHA1 (patch-bin_nf__common.c) = 89a5d819a3076badf94d4151cda8a0e86d4dc55b
+SHA1 (patch-bin_nf__common.c) = 2460a84a1e778ba46a64208c6d251cce285019e9
+SHA1 (patch-bin_nf__common.h) = ad44825d41b3126d7df21faaf659f5262a7eef03
 SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb
 SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a
 SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b
diff --git a/net/nfdump/patches/patch-bin_nf__common.c b/net/nfdump/patches/patch-bin_nf__common.c
index a9574da8524..e3acdea1571 100644
--- a/net/nfdump/patches/patch-bin_nf__common.c
+++ b/net/nfdump/patches/patch-bin_nf__common.c
@@ -1,10 +1,19 @@
-$NetBSD: patch-bin_nf__common.c,v 1.1 2012/12/26 21:41:52 dholland Exp $
+$NetBSD: patch-bin_nf__common.c,v 1.2 2013/01/11 13:33:59 joerg Exp $
 
 Fix gcc inline.
 
---- bin/nf_common.c~	2012-02-19 10:42:43.000000000 +0000
+--- bin/nf_common.c.orig	2012-02-19 10:42:43.000000000 +0000
 +++ bin/nf_common.c
-@@ -1440,7 +1440,7 @@ int	i, remaining;
+@@ -487,7 +487,7 @@ int Getv6Mode(void) {
+ #ifdef __SUNPRO_C
+ extern
+ #endif
+-inline void Proto_string(uint8_t protonum, char *protostr) {
++void Proto_string(uint8_t protonum, char *protostr) {
+ 
+ 	if ( protonum >= NumProtos || no_scale ) {
+ 		snprintf(protostr,16,"%-5i", protonum );
+@@ -1440,10 +1440,10 @@ int	i, remaining;
  
  } // End of ParseOutputFormat
  
@@ -12,4 +21,17 @@ Fix gcc inline.
 +#if !defined(__GNUC__) || !defined(__GNUC_STDC_INLINE__)
  extern
  #endif
- inline void format_number(uint64_t num, char *s, int fixed_width) {
+-inline void format_number(uint64_t num, char *s, int fixed_width) {
++void format_number(uint64_t num, char *s, int fixed_width) {
+ double f = num;
+ 
+ 	if ( no_scale ) {
+@@ -1475,7 +1475,7 @@ double f = num;
+ 
+ } // End of format_number
+ 
+-inline void condense_v6(char *s) {
++void condense_v6(char *s) {
+ size_t len = strlen(s);
+ char	*p, *q;
+ 
diff --git a/net/nfdump/patches/patch-bin_nf__common.h b/net/nfdump/patches/patch-bin_nf__common.h
new file mode 100644
index 00000000000..e89f0344b85
--- /dev/null
+++ b/net/nfdump/patches/patch-bin_nf__common.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-bin_nf__common.h,v 1.1 2013/01/11 13:33:59 joerg Exp $
+
+--- bin/nf_common.h.orig	2013-01-11 01:23:53.000000000 +0000
++++ bin/nf_common.h
+@@ -99,17 +99,17 @@ char *Get_fwd_status_name(uint32_t id);
+ #ifdef __SUNPRO_C
+ extern 
+ #endif
+-inline void Proto_string(uint8_t protonum, char *protostr);
++void Proto_string(uint8_t protonum, char *protostr);
+ 
+ #ifdef __SUNPRO_C
+ extern 
+ #endif
+-inline void format_number(uint64_t num, char *s, int fixed_width);
++void format_number(uint64_t num, char *s, int fixed_width);
+ 
+ #ifdef __SUNPRO_C
+ extern 
+ #endif
+-inline void condense_v6(char *s);
++void condense_v6(char *s);
+ 
+ #define TAG_CHAR '
'
+