1.1 --- a/netperf/netperf.patch Tue Aug 28 18:37:20 2012 +0200
1.2 +++ b/netperf/netperf.patch Tue Aug 28 18:37:35 2012 +0200
1.3 @@ -1,46 +1,31 @@
1.4 -diff -Nau configure.orig configure
1.5 -Index: configure
1.6 ---- configure.orig 2011-03-21 09:30:50.934813866 +0100
1.7 -+++ configure 2011-03-21 09:31:27.459048318 +0100
1.8 -@@ -8748,6 +8748,7 @@
1.9 - cat confdefs.h >>conftest.$ac_ext
1.10 - cat >>conftest.$ac_ext <<_ACEOF
1.11 - /* end confdefs.h. */
1.12 -+#include <sys/socket.h>
1.13 - #include <netinet/sctp.h>
1.14 +diff -Nau src/dscp.c.orig src/dscp.c
1.15 +Index: src/dscp.c
1.16 +--- src/dscp.c.orig 2012-08-21 12:14:56.541033514 +0200
1.17 ++++ src/dscp.c 2012-08-21 12:15:00.668991007 +0200
1.18 +@@ -50,6 +50,7 @@
1.19 + */
1.20
1.21 - int
1.22 -diff -Nau src/net_uuid.c.orig src/net_uuid.c
1.23 -Index: src/net_uuid.c
1.24 ---- src/net_uuid.c.orig 2008-10-25 01:13:44.000000000 +0200
1.25 -+++ src/net_uuid.c 2011-03-21 14:23:16.000000000 +0100
1.26 -@@ -38,8 +38,10 @@
1.27 - #else
1.28 - #include <sys/types.h>
1.29 - #include <sys/time.h>
1.30 -+#if !defined(__APPLE__) && !defined(__MACH__)
1.31 - #include <sys/sysinfo.h>
1.32 + #if HAVE_NETINET_IN_SYSTM_H
1.33 ++#include <stdint.h>
1.34 + #include <netinet/in_systm.h>
1.35 #endif
1.36 -+#endif
1.37 -
1.38 - /* system dependent call to get the current system time. Returned as
1.39 - 100ns ticks since UUID epoch, but resolution may be less than
1.40 + #if HAVE_NETINET_IP_H
1.41 diff -Nau src/nettest_bsd.c.orig src/nettest_bsd.c
1.42 Index: src/nettest_bsd.c
1.43 ---- src/nettest_bsd.c.orig 2011-03-21 09:20:13.471888999 +0100
1.44 -+++ src/nettest_bsd.c 2011-03-21 09:20:16.343927098 +0100
1.45 -@@ -97,6 +97,7 @@
1.46 - #endif /* NOSTDLIBH */
1.47 +--- src/nettest_bsd.c.orig 2012-06-19 22:32:47.000000000 +0200
1.48 ++++ src/nettest_bsd.c 2012-08-21 12:15:36.378376195 +0200
1.49 +@@ -106,6 +106,7 @@
1.50 + #include <netinet/tcp.h>
1.51
1.52 - #ifdef WANT_SCTP
1.53 + #ifdef HAVE_NETINET_SCTP_H
1.54 +#include <sys/socket.h>
1.55 #include <netinet/sctp.h>
1.56 #endif
1.57
1.58 diff -Nau src/nettest_sctp.c.orig src/nettest_sctp.c
1.59 Index: src/nettest_sctp.c
1.60 ---- src/nettest_sctp.c.orig 2011-03-21 09:22:57.248890123 +0100
1.61 -+++ src/nettest_sctp.c 2011-03-21 09:23:02.907197031 +0100
1.62 +--- src/nettest_sctp.c.orig 2012-06-19 22:39:22.000000000 +0200
1.63 ++++ src/nettest_sctp.c 2012-08-21 12:16:25.314029201 +0200
1.64 @@ -58,6 +58,7 @@
1.65 #include <netinet/sctp.h>
1.66 #include <arpa/inet.h>
