commit 25fb460a03f25e3a68d4ecb5e3a35d366f772f62
author Elliott Hughes <enh@google.com> Mon Nov 10 23:31:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 10 23:31:07 2014 +0000
tree 9911938e6eeb0d0a4a6aa41fc0b07c9133f68b4c
parent b777eacc871e246782ea61f51d87f75f9dc2bc15
parent ae52248fa7ab12e1c3458aede101f143b1c76ead

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.

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 1902b77..d908ba8 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -448,10 +448,8 @@
         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) {