diff --git a/Libraries/LibCore/ResourceImplementation.cpp b/Libraries/LibCore/ResourceImplementation.cpp index bae2279f8a1..2834124acef 100644 --- a/Libraries/LibCore/ResourceImplementation.cpp +++ b/Libraries/LibCore/ResourceImplementation.cpp @@ -9,10 +9,6 @@ #include #include -#if defined(AK_OS_WINDOWS) -# include -#endif - namespace Core { static OwnPtr s_the; diff --git a/Libraries/LibCore/ResourceImplementationFile.cpp b/Libraries/LibCore/ResourceImplementationFile.cpp index f973b8410f7..4ee4bcc2cf6 100644 --- a/Libraries/LibCore/ResourceImplementationFile.cpp +++ b/Libraries/LibCore/ResourceImplementationFile.cpp @@ -11,10 +11,6 @@ #include #include -#if defined(AK_OS_WINDOWS) -# include -#endif - namespace Core { ResourceImplementationFile::ResourceImplementationFile(String base_directory) diff --git a/Libraries/LibCore/System.h b/Libraries/LibCore/System.h index ee195dc3806..7d8517e9ae3 100644 --- a/Libraries/LibCore/System.h +++ b/Libraries/LibCore/System.h @@ -33,6 +33,8 @@ # include #else # define O_CLOEXEC O_NOINHERIT +# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) using sighandler_t = void (*)(int); using socklen_t = int; #endif diff --git a/Libraries/LibFileSystem/CMakeLists.txt b/Libraries/LibFileSystem/CMakeLists.txt index e782d40baab..972e3499d65 100644 --- a/Libraries/LibFileSystem/CMakeLists.txt +++ b/Libraries/LibFileSystem/CMakeLists.txt @@ -5,8 +5,3 @@ endif() serenity_lib(LibFileSystem filesystem) target_link_libraries(LibFileSystem PRIVATE LibCoreMinimal) - -if (WIN32) - find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED) - target_include_directories(LibFileSystem PRIVATE ${DIRENT_INCLUDE_DIR}) -endif() diff --git a/Libraries/LibFileSystem/FileSystem.cpp b/Libraries/LibFileSystem/FileSystem.cpp index 243087e942c..c59c9127c19 100644 --- a/Libraries/LibFileSystem/FileSystem.cpp +++ b/Libraries/LibFileSystem/FileSystem.cpp @@ -16,7 +16,7 @@ #elif defined(AK_OS_LINUX) # include #elif defined(AK_OS_WINDOWS) -# include +# include #endif // On Linux distros that use glibc `basename` is defined as a macro that expands to `__xpg_basename`, so we undefine it