summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2016-11-04 17:28:22 +0100
committerJason A. Donenfeld <zx2c4@gentoo.org>2016-11-04 17:28:28 +0100
commit8990401a1a125f47986d724ddd42885fe647b130 (patch)
tree1c707ab1fb5abd8e05b5f414ab0cfc00c4b56df8 /net-analyzer/netperf/files
parentnet-analyzer/flent: bump (diff)
downloadgentoo-8990401a1a125f47986d724ddd42885fe647b130.tar.gz
gentoo-8990401a1a125f47986d724ddd42885fe647b130.tar.bz2
gentoo-8990401a1a125f47986d724ddd42885fe647b130.zip
net-analyzer/netperf: fix build with USE=demo
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-analyzer/netperf/files')
-rw-r--r--net-analyzer/netperf/files/netperf-2.7.0-inline.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
new file mode 100644
index 000000000000..eb8c09b84695
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
@@ -0,0 +1,32 @@
+# Copyright Seblu 2015
+--- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200
++++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200
+@@ -3997,11 +3997,7 @@
+ }
+ }
+
+-#ifdef WIN32
+-__forceinline void demo_interval_display(double actual_interval)
+-#else
+- inline void demo_interval_display(double actual_interval)
+-#endif
++void demo_interval_display(double actual_interval)
+ {
+ static int count = 0;
+ struct timeval now;
+@@ -4060,15 +4056,7 @@
+ important compilers have supported such a construct so it should
+ not be a big deal. raj 2012-01-23 */
+
+-#ifdef WIN32
+-/* It would seem that the Microsoft compiler will not inline across
+- source files. So there is little point in having an inline
+- directive in that situation. Of course that makes me wonder if an
+- inline directive has to appear in netlib.h... */
+ void demo_interval_tick(uint32_t units)
+-#else
+- inline void demo_interval_tick(uint32_t units)
+-#endif
+ {
+ double actual_interval = 0.0;
+