From d1ead2af8bf2f6bb801da272e3778f89efefe613 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 6 Jun 2014 15:24:20 -0700
Subject: [PATCH] Fix ndk_cruft.cpp __getdents64 build failure.

Change-Id: Ia463113da0575b36b5a9935d8d45e7bd2c801357
---
 libc/bionic/dirent.cpp    | 2 +-
 libc/bionic/ndk_cruft.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libc/bionic/dirent.cpp b/libc/bionic/dirent.cpp
index 091423ea6..7abc7f3ec 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_;
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index b0adf2639..b73c47e3e 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 @@ extern "C" sighandler_t sysv_signal(int signum, sighandler_t handler) {
 }
 
 // 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);
 }