summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-11-10 23:20:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-10 23:20:14 +0000
commitae52248fa7ab12e1c3458aede101f143b1c76ead (patch)
treed77f0b781cbe5485bf8b28ddc4b60e1fb7cf125a
parent1da681ca4d3d2b5973d364e80f7a5db47d1240c1 (diff)
parent57583a789f0e16b916061cd7066bbf156e728986 (diff)
downloadsystem_core-ae52248fa7ab12e1c3458aede101f143b1c76ead.zip
system_core-ae52248fa7ab12e1c3458aede101f143b1c76ead.tar.gz
system_core-ae52248fa7ab12e1c3458aede101f143b1c76ead.tar.bz2
Merge "init isn't built for platforms without dirent::d_type."
-rw-r--r--init/property_service.c2
1 files changed, 0 insertions, 2 deletions
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 @@ 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) {