1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
Description: Some include file changes via/inspired-by Elliott Hughes
Author: raj <raj@5bbd99f3-5903-0410-b283-f1d88047b228>
Origin: upstream, https://github.com/HewlettPackard/netperf/commit/0b0cbbe
--- a/AUTHORS
+++ b/AUTHORS
@@ -308,3 +308,5 @@
Weijia Song - a fix inspiration for a NULL pointer problem.
Gisle Vanem - some Windows compilation fixes
+
+Elliott Hughes - some fixes for Android compilation
\ No newline at end of file
--- a/config.h.in
+++ b/config.h.in
@@ -226,6 +226,9 @@
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+#undef HAVE_SYS_SENDFILE_H
+
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@
AC_HEADER_SYS_WAIT
# lets keep this in some semblence of alphabetical order
-AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h linux/socket.h malloc.h netdb.h netinet/in.h netinet/sctp.h sched.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h sys/wait.h stdlib.h unistd.h netinet/in_systm.h netinet/ip.h])
+AC_CHECK_HEADERS([arpa/inet.h endian.h errno.h fcntl.h ifaddrs.h limits.h linux/tcp.h linux/socket.h malloc.h netdb.h netinet/in.h netinet/sctp.h sched.h signal.h stdlib.h string.h strings.h syscall.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/stat.h sys/time.h sys/wait.h sys/ipc.h sys/sockio.h sys/sysinfo.h sys/wait.h stdlib.h unistd.h netinet/in_systm.h netinet/ip.h sys/sendfile.h])
# Some platforms require these. There may be a better way.
AC_HAVE_LIBRARY(socket)
--- a/src/net_uuid.c
+++ b/src/net_uuid.c
@@ -29,6 +29,10 @@
#include <string.h>
#include <fcntl.h>
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
#if defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#endif
--- a/src/netlib.h
+++ b/src/netlib.h
@@ -434,6 +434,10 @@
(((return_value) == SOCKET_ERROR) && (errno == WSAEWOULDBLOCK))
#endif
+#if defined(HAVE_SYS_SENDFILE_H)
+#include <sys/sendfile.h>
+#endif
+
#ifdef HAVE_SENDFILE
#endif /* HAVE_SENDFILE */
|
