am ae52248f: Merge "init isn\'t built for platforms without dirent::d_type."

* commit 'ae52248fa7ab12e1c3458aede101f143b1c76ead':
  init isn't built for platforms without dirent::d_type.
This commit is contained in:
Elliott Hughes 2014-11-10 23:31:07 +00:00 committed by Android Git Automerger
commit 25fb460a03

View file

@ -448,10 +448,8 @@ static void load_persistent_properties()
while ((entry = readdir(dir)) != NULL) {
if (strncmp("persist.", entry->d_name, strlen("persist.")))
continue;
#if HAVE_DIRENT_D_TYPE
if (entry->d_type != DT_REG)
continue;
#endif
/* open the file and read the property value */
fd = openat(dir_fd, entry->d_name, O_RDONLY | O_NOFOLLOW);
if (fd < 0) {