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

[senthil.kumaran]

http://hg.python.org/cpython/rev/a153cd9b2e16
changeset:   90295:a153cd9b2e16
branch:      3.4
parent:      90292:29d07cd3d91f
parent:      90287:211eeb97b352
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Apr 14 16:43:58 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