0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch 1.3 KB

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