[Python-checkins] cpython (merge default -> default): merge heads

Mon Apr 14 22:49:19 CEST 2014

http://hg.python.org/cpython/rev/886bf974c079
changeset: 90294:886bf974c079
parent: 90293:f769925b066f
parent: 90289:8ab6eedf3a18
user: Senthil Kumaran <senthil at uthcode.com>
date: Mon Apr 14 16:37:57 2014 -0400
summary:
 merge heads
files:
 Modules/_posixsubprocess.c | 6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
--- 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
-- 
Repository URL: http://hg.python.org/cpython
