summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-04-14 20:43:58 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-04-14 20:43:58 (GMT)
commitb735f523d392540030f40cf3e8d00427d7824f35 (patch)
tree66896c916c561d177a9c3b63b631224f09fa86d0
parentd8e24f1f716d32237f780e31c45431c5c458ff26 (diff)
parentefeb9da4ae97861101a7582f8eafdaf836e82cd7 (diff)
downloadcpython-b735f523d392540030f40cf3e8d00427d7824f35.zip
cpython-b735f523d392540030f40cf3e8d00427d7824f35.tar.gz
cpython-b735f523d392540030f40cf3e8d00427d7824f35.tar.bz2
merge heads
-rw-r--r--Modules/_posixsubprocess.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index a2d7022..648a569 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -18,6 +18,12 @@
#include <dirent.h>
#endif
+#if defined(__ANDROID__) && !defined(SYS_getdents64)
+/* Android doesn't expose syscalls, add the definition manually. */
+# include <sys/linux-syscalls.h>
+# define SYS_getdents64 __NR_getdents64
+#endif
+
#if defined(sun)
/* readdir64 is used to work around Solaris 9 bug 6395699. */
# define readdir readdir64