tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."

Browse source 
* commit '83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
  Remove HAVE_DIRENT_D_TYPE.
This commit is contained in:
Elliott Hughes 2014-11-11 00:07:17 +00:00 committed by Android Git Automerger
commit 499ed6c496
9 changed files with 1 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/combo/include/arch/darwin-x86/AndroidConfig.h
View file

@ -114,11 +114,6 @@
*/
/* #define HAVE_MALLOC_H */
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if we have madvise() in <sys/mman.h>
*/

5
core/combo/include/arch/linux-arm/AndroidConfig.h
View file

@ -125,11 +125,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if libc includes Android system properties implementation.
*/

5
core/combo/include/arch/linux-arm64/AndroidConfig.h
View file

@ -123,11 +123,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if libc includes Android system properties implementation.
*/

5
core/combo/include/arch/linux-mips/AndroidConfig.h
View file

@ -165,11 +165,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if libc includes Android system properties implementation.
*/

5
core/combo/include/arch/linux-mips64/AndroidConfig.h
View file

@ -155,11 +155,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if libc includes Android system properties implementation.
*/

5
core/combo/include/arch/linux-x86/AndroidConfig.h
View file

@ -121,11 +121,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if system provides a system property server (should be
* mutually exclusive with HAVE_LIBC_SYSTEM_PROPERTIES).

5
core/combo/include/arch/target_linux-x86/AndroidConfig.h
View file

@ -117,11 +117,6 @@
*/
#define HAVE_MADVISE 1
/*
* Define if dirent struct has d_type field
*/
#define HAVE_DIRENT_D_TYPE 1
/*
* Define if libc includes Android system properties implementation.
*/

9
tools/atree/files.cpp
View file

@ -447,14 +447,7 @@ list_dir(const string& path, const FileRecord& rec,
continue;
}
string entry = path_append(path, ent->d_name);
#ifdef HAVE_DIRENT_D_TYPE
bool is_directory = (ent->d_type == DT_DIR);
#else
// If dirent.d_type is missing, then use stat instead
struct stat stat_buf;
stat(entry.c_str(), &stat_buf);
bool is_directory = S_ISDIR(stat_buf.st_mode);
#endif
bool is_directory = (ent->d_type == DT_DIR);
add_more(entry, is_directory, rec, more);
if (is_directory) {
dirs.push_back(entry);

7
tools/atree/fs.cpp
View file

@ -63,14 +63,7 @@ remove_recursively(const string& path)
string full = path;
full += '/';
full += ent->d_name;
#ifdef HAVE_DIRENT_D_TYPE
bool is_directory = (ent->d_type == DT_DIR);
#else
// If dirent.d_type is missing, then use stat instead
struct stat stat_buf;
stat(full.c_str(), &stat_buf);
bool is_directory = S_ISDIR(stat_buf.st_mode);
#endif
if (is_directory) {
dirs.push_back(full);
} else {