RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

LibCore: Use DirectoryEntry::from_stat on Haiku

Browse source
This commit is contained in:
nipos 2023-08-27 21:06:35 +02:00 • committed by Andrew Kaster
parent 1d475e9312
commit cf6781cdee
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/DirIterator.cpp
View file

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

4
Userland/Libraries/LibCore/DirectoryEntry.cpp
View file

@ -32,7 +32,7 @@ static DirectoryEntry::Type directory_entry_type_from_stat(mode_t st_mode)
VERIFY_NOT_REACHED(); 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) static DirectoryEntry::Type directory_entry_type_from_posix(unsigned char dt_constant)
{ {
switch (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) DirectoryEntry DirectoryEntry::from_dirent(dirent const& de)
{ {
return DirectoryEntry { return DirectoryEntry {