generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am afd4df20: am 6fa47ca4: Merge "Fix ndk_cruft.cpp __getdents64 build failure."

Browse Source 
* commit 'afd4df20c99e52be84d1cac2108c18619f32b5f2':
  Fix ndk_cruft.cpp __getdents64 build failure.
This commit is contained in:
Elliott Hughes 2014-06-06 22:45:50 +00:00 committed by Android Git Automerger
commit 53495dad3a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/dirent.cpp
View File

@ -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_;

4
libc/bionic/ndk_cruft.cpp
View File

@ -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);
}