commit d1ead2af8bf2f6bb801da272e3778f89efefe613
author Elliott Hughes <enh@google.com> Fri Jun 06 15:24:20 2014 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 06 15:24:20 2014 -0700
tree 0b9ad65d08c8d28d4ce1d71aff1c46853a0322cb
parent 087b3cfa5b56c2e4a29cca225fdb1956033868ac

Fix ndk_cruft.cpp __getdents64 build failure.

Change-Id: Ia463113da0575b36b5a9935d8d45e7bd2c801357

libc/bionic/dirent.cpp

diff --git a/libc/bionic/dirent.cpp b/libc/bionic/dirent.cpp
index 091423e..7abc7f3 100644
--- a/libc/bionic/dirent.cpp
+++ b/libc/bionic/dirent.cpp
@@ -37,7 +37,7 @@
 #include "private/ErrnoRestorer.h"
 #include "private/ScopedPthreadMutexLocker.h"
 
-extern "C" int __getdents64(unsigned int, struct dirent*, unsigned int);
+extern "C" int __getdents64(unsigned int, dirent*, unsigned int);
 
 struct DIR {
   int fd_;

libc/bionic/ndk_cruft.cpp

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index b0adf26..b73c47e 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -30,6 +30,7 @@
 #if !defined(__LP64__)
 
 #include <ctype.h>
+#include <dirent.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <signal.h>
@@ -239,7 +240,8 @@
 }
 
 // This is a system call that was never in POSIX. Use readdir(3) instead.
-extern "C" int getdents(unsigned int fd, struct dirent* dirp, unsigned int count) {
+extern "C" int __getdents64(unsigned int, dirent*, unsigned int);
+extern "C" int getdents(unsigned int fd, dirent* dirp, unsigned int count) {
   return __getdents64(fd, dirp, count);
 }