Fri Jan 11 13:33:59 2013 UTC ()
Really fix inline usage.


(joerg)
diff -r1.7 -r1.8 pkgsrc/net/nfdump/distinfo
diff -r1.1 -r1.2 pkgsrc/net/nfdump/patches/patch-bin_nf__common.c
diff -r0 -r1.1 pkgsrc/net/nfdump/patches/patch-bin_nf__common.h
cvs diff -r1.7 -r1.8 pkgsrc/net/nfdump/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nfdump/distinfo 2012/12/26 21:41:52 1.7
+++ pkgsrc/net/nfdump/distinfo 2013/01/11 13:33:59 1.8
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.7 2012/12/26 21:41:52 dholland Exp $ 1$NetBSD: distinfo,v 1.8 2013/01/11 13:33:59 joerg Exp $
2 2
3SHA1 (nfdump-1.6.6.tar.gz) = f7a30c69419222f1527684fb46f02ae757b3dac0 3SHA1 (nfdump-1.6.6.tar.gz) = f7a30c69419222f1527684fb46f02ae757b3dac0
4RMD160 (nfdump-1.6.6.tar.gz) = 63d5aec9e7f6d2ee151a88451e52ac86263996e4 4RMD160 (nfdump-1.6.6.tar.gz) = 63d5aec9e7f6d2ee151a88451e52ac86263996e4
5Size (nfdump-1.6.6.tar.gz) = 651348 bytes 5Size (nfdump-1.6.6.tar.gz) = 651348 bytes
6SHA1 (patch-bin_nf__common.c) = 89a5d819a3076badf94d4151cda8a0e86d4dc55b 6SHA1 (patch-bin_nf__common.c) = 2460a84a1e778ba46a64208c6d251cce285019e9
 7SHA1 (patch-bin_nf__common.h) = ad44825d41b3126d7df21faaf659f5262a7eef03
7SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb 8SHA1 (patch-bin_nfcapd.c) = d704b76af63547f9365dc56a65931e0df9d788fb
8SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a 9SHA1 (patch-bin_sfcapd.c) = 14d9cbef9c059629606d38df5a4cfa5aa082942a
9SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b 10SHA1 (patch-configure) = 02ddab9c6ee4d862b0e8f006ab3432b07923bf0b
10SHA1 (patch-configure.in) = 98d3e0db6f81cfc12b7d719189adf5f7ee8c6594 11SHA1 (patch-configure.in) = 98d3e0db6f81cfc12b7d719189adf5f7ee8c6594
cvs diff -r1.1 -r1.2 pkgsrc/net/nfdump/patches/Attic/patch-bin_nf__common.c (expand / switch to unified diff)

--- pkgsrc/net/nfdump/patches/Attic/patch-bin_nf__common.c 2012/12/26 21:41:52 1.1
+++ pkgsrc/net/nfdump/patches/Attic/patch-bin_nf__common.c 2013/01/11 13:33:59 1.2
@@ -1,15 +1,37 @@ @@ -1,15 +1,37 @@
1$NetBSD: patch-bin_nf__common.c,v 1.1 2012/12/26 21:41:52 dholland Exp $ 1$NetBSD: patch-bin_nf__common.c,v 1.2 2013/01/11 13:33:59 joerg Exp $
2 2
3Fix gcc inline. 3Fix gcc inline.
4 4
5--- bin/nf_common.c~ 2012-02-19 10:42:43.000000000 +0000 5--- bin/nf_common.c.orig 2012-02-19 10:42:43.000000000 +0000
6+++ bin/nf_common.c 6+++ bin/nf_common.c
7@@ -1440,7 +1440,7 @@ int i, remaining; 7@@ -487,7 +487,7 @@ int Getv6Mode(void) {
 8 #ifdef __SUNPRO_C
 9 extern
 10 #endif
 11-inline void Proto_string(uint8_t protonum, char *protostr) {
 12+void Proto_string(uint8_t protonum, char *protostr) {
 13
 14 if ( protonum >= NumProtos || no_scale ) {
 15 snprintf(protostr,16,"%-5i", protonum );
 16@@ -1440,10 +1440,10 @@ int i, remaining;
8  17
9 } // End of ParseOutputFormat 18 } // End of ParseOutputFormat
10  19
11-#ifdef __SUNPRO_C 20-#ifdef __SUNPRO_C
12+#if !defined(__GNUC__) || !defined(__GNUC_STDC_INLINE__) 21+#if !defined(__GNUC__) || !defined(__GNUC_STDC_INLINE__)
13 extern 22 extern
14 #endif 23 #endif
15 inline void format_number(uint64_t num, char *s, int fixed_width) { 24-inline void format_number(uint64_t num, char *s, int fixed_width) {
 25+void format_number(uint64_t num, char *s, int fixed_width) {
 26 double f = num;
 27
 28 if ( no_scale ) {
 29@@ -1475,7 +1475,7 @@ double f = num;
 30
 31 } // End of format_number
 32
 33-inline void condense_v6(char *s) {
 34+void condense_v6(char *s) {
 35 size_t len = strlen(s);
 36 char *p, *q;
 37
File Added: pkgsrc/net/nfdump/patches/Attic/patch-bin_nf__common.h
$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 ''