Browse Source

LibCore: Use DirectoryEntry::from_stat on Haiku

nipos 1 năm trước cách đây
mục cha
commit
cf6781cdee

+ 1 - 1
Userland/Libraries/LibCore/DirIterator.cpp

@@ -56,7 +56,7 @@ bool DirIterator::advance_next()
             return false;
         }
 
-#ifdef AK_OS_SOLARIS
+#if defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU)
         m_next = DirectoryEntry::from_stat(m_dir, *de);
 #else
         m_next = DirectoryEntry::from_dirent(*de);

+ 2 - 2
Userland/Libraries/LibCore/DirectoryEntry.cpp

@@ -32,7 +32,7 @@ static DirectoryEntry::Type directory_entry_type_from_stat(mode_t st_mode)
     VERIFY_NOT_REACHED();
 }
 
-#ifndef AK_OS_SOLARIS
+#if !defined(AK_OS_SOLARIS) && !defined(AK_OS_HAIKU)
 static DirectoryEntry::Type directory_entry_type_from_posix(unsigned char dt_constant)
 {
     switch (dt_constant) {
@@ -72,7 +72,7 @@ DirectoryEntry DirectoryEntry::from_stat(DIR* d, dirent const& de)
     };
 }
 
-#ifndef AK_OS_SOLARIS
+#if !defined(AK_OS_SOLARIS) && !defined(AK_OS_HAIKU)
 DirectoryEntry DirectoryEntry::from_dirent(dirent const& de)
 {
     return DirectoryEntry {