merge from open-source master

include/arch/darwin-x86/AndroidConfig.h

@@ -85,6 +85,11 @@
  */
 #define  HAVE_TERMIO_H
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+/* #define  HAVE_SYS_SENDFILE_H 1 */
+
 /*
  * Define this if you build against MSVCRT.DLL
  */

include/arch/freebsd-x86/AndroidConfig.h

@@ -90,6 +90,11 @@
  */
 /* #define  HAVE_TERMIO_H */
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+/* #define  HAVE_SYS_SENDFILE_H 1 */
+
 /*
  * Define this if you build against MSVCRT.DLL
  */

include/arch/linux-arm/AndroidConfig.h

@@ -91,6 +91,11 @@
  */
 #define  HAVE_TERMIO_H
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+#define  HAVE_SYS_SENDFILE_H 1
+
 /*
  * Define this if you build against MSVCRT.DLL
  */

include/arch/linux-sh/AndroidConfig.h

@@ -91,6 +91,11 @@
  */
 #define  HAVE_TERMIO_H
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+#define  HAVE_SYS_SENDFILE_H 1
+
 /*
  * Define this if you build against MSVCRT.DLL
  */

include/arch/linux-x86/AndroidConfig.h

@@ -85,6 +85,11 @@
  */
 #define  HAVE_TERMIO_H
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+#define  HAVE_SYS_SENDFILE_H 1
+
 /*
  * Define this if you build against MSVCRT.DLL
  */

include/arch/target_linux-x86/AndroidConfig.h

@@ -77,6 +77,11 @@
  */
 #define  HAVE_TERMIO_H 1
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+#define  HAVE_SYS_SENDFILE_H 1
+
 /*
  * Define this if you build against have Microsoft C runtime (MSVCRT.DLL)
  */

include/arch/windows/AndroidConfig.h

@@ -100,6 +100,13 @@
 #  define  HAVE_TERMIO_H
 #endif
 
+/*
+ * Define this if you have <sys/sendfile.h>
+ */
+#ifdef __CYGWIN__
+#  define  HAVE_SYS_SENDFILE_H 1
+#endif
+
 /*
  * Define this if you build against MSVCRT.DLL
  */