1From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Sat, 5 Sep 2020 14:30:20 +0200
4Subject: [PATCH] src/nettest_omni.c: fix compilation with GCC10
5
6GCC10 defaults to -fno-common, which breaks compilation when there are
7multiple definitions of implicit "extern" variables. Remove the extra
8definitions.
9
10Fix #42
11
12Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
13[Retrieved from:
14https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch]
15Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
16[Upstream status: https://github.com/HewlettPackard/netperf/pull/48]
17---
18 src/nettest_omni.c | 8 --------
19 1 file changed, 8 deletions(-)
20
21diff --git a/src/nettest_omni.c b/src/nettest_omni.c
22index 852eeb1..862088a 100644
23--- a/src/nettest_omni.c
24+++ b/src/nettest_omni.c
25@@ -458,14 +458,6 @@ static int client_port_max = 65535;
26
27  /* different options for the sockets				*/
28
29-int
30-  loc_nodelay,		/* don't/do use NODELAY	locally		*/
31-  rem_nodelay,		/* don't/do use NODELAY remotely	*/
32-  loc_sndavoid,		/* avoid send copies locally		*/
33-  loc_rcvavoid,		/* avoid recv copies locally		*/
34-  rem_sndavoid,		/* avoid send copies remotely		*/
35-  rem_rcvavoid; 	/* avoid recv_copies remotely		*/
36-
37 extern int
38   loc_tcpcork,
39   rem_tcpcork,
40--
412.28.0
42
43