merge heads

This commit is contained in:
Senthil Kumaran 2014-04-14 16:37:57 -04:00
commit f822b73d79
1 changed files with 6 additions and 0 deletions

View File

@ -18,6 +18,12 @@
#include <dirent.h> #include <dirent.h>
#endif #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) #if defined(sun)
/* readdir64 is used to work around Solaris 9 bug 6395699. */ /* readdir64 is used to work around Solaris 9 bug 6395699. */
# define readdir readdir64 # define readdir readdir64