merge heads

b735f523 · Senthil Kumaran · d8e24f1f · efeb9da4 · b735f523
Commit b735f523 authored Apr 14, 2014 by Senthil Kumaran
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Modules/_posixsubprocess.c Modules/_posixsubprocess.c +6 -0

No files found.
--- 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