From ab4eaababec7f870378ed64fbbf51b154b292a7b Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 22 Feb 2024 20:44:50 +0100 Subject: Kernel: nightly bump. Signed-off-by: Amlal El Mahrouss --- Private/KernelKit/FileManager.hpp | 8 ++++---- Private/Source/NewFS+FileManager.cxx | 4 ++-- Private/Source/NewFS+IO.cxx | 4 ++-- Private/Source/NewFS+Journal.cxx | 4 ++-- Private/Source/compile_flags.txt | 2 +- Private/makefile | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Private/KernelKit/FileManager.hpp b/Private/KernelKit/FileManager.hpp index a191368e..21d5c276 100644 --- a/Private/KernelKit/FileManager.hpp +++ b/Private/KernelKit/FileManager.hpp @@ -17,9 +17,9 @@ #pragma once -#ifdef __USE_NEWFS__ +#ifdef __FSKIT_NEWFS__ #include -#endif // __USE_NEWFS__ +#endif // __FSKIT_NEWFS__ #include #include @@ -92,7 +92,7 @@ class IFilesystemManager { /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -#ifdef __USE_NEWFS__ +#ifdef __FSKIT_NEWFS__ /** * @brief Based of IFilesystemManager, takes care of managing NewFS disks. */ @@ -154,7 +154,7 @@ class NewFilesystemManager final : public IFilesystemManager { NewFSImplementation *fImpl{nullptr}; }; -#endif // ifdef __USE_NEWFS__ +#endif // ifdef __FSKIT_NEWFS__ /** * Usable FileStream diff --git a/Private/Source/NewFS+FileManager.cxx b/Private/Source/NewFS+FileManager.cxx index b0ba37c6..d1ea58f6 100644 --- a/Private/Source/NewFS+FileManager.cxx +++ b/Private/Source/NewFS+FileManager.cxx @@ -9,7 +9,7 @@ #include -#ifdef __USE_NEWFS__ +#ifdef __FSKIT_NEWFS__ /// BUGS: 0 @@ -51,4 +51,4 @@ const char* NewFilesystemHelper::UpDir() { return kFilesystemUpDir; } const char NewFilesystemHelper::Separator() { return kFilesystemSeparator; } } // namespace HCore -#endif // ifdef __USE_NEWFS__ +#endif // ifdef __FSKIT_NEWFS__ diff --git a/Private/Source/NewFS+IO.cxx b/Private/Source/NewFS+IO.cxx index 1a9ac1ad..a4299f72 100644 --- a/Private/Source/NewFS+IO.cxx +++ b/Private/Source/NewFS+IO.cxx @@ -16,10 +16,10 @@ ------------------------------------------------------- */ -#ifdef __USE_NEWFS__ +#ifdef __FSKIT_NEWFS__ /// @brief This implements NewFS with Device Abstraction in mind. /// bugs 0 -#endif // ifdef __USE_NEWFS__ +#endif // ifdef __FSKIT_NEWFS__ diff --git a/Private/Source/NewFS+Journal.cxx b/Private/Source/NewFS+Journal.cxx index 72812b6e..a06249b2 100644 --- a/Private/Source/NewFS+Journal.cxx +++ b/Private/Source/NewFS+Journal.cxx @@ -10,7 +10,7 @@ #include #include -#ifdef __USE_NEWFS__ +#ifdef __FSKIT_NEWFS__ //! bugs: 0 //! @brief Journaling for NewFS. @@ -61,4 +61,4 @@ class NewFSJournalRunner final { }; } // namespace HCore -#endif // ifdef __USE_NEWFS__ +#endif // ifdef __FSKIT_NEWFS__ diff --git a/Private/Source/compile_flags.txt b/Private/Source/compile_flags.txt index b2809811..b96cbe62 100644 --- a/Private/Source/compile_flags.txt +++ b/Private/Source/compile_flags.txt @@ -3,4 +3,4 @@ -std=c++20 -I../ -I$(HOME)/ --D__USE_NEWFS__ +-D__FSKIT_NEWFS__ diff --git a/Private/makefile b/Private/makefile index 9aab13b8..a077b2c9 100644 --- a/Private/makefile +++ b/Private/makefile @@ -5,7 +5,7 @@ CC = x86_64-w64-mingw32-g++ LD = x86_64-w64-mingw32-ld -CCFLAGS = -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__DEBUG__ -D__USE_NEWFS__ -D__HAVE_HCORE_APIS__ -D__HCORE__ -I../ -I./ -I$(HOME)/ +CCFLAGS = -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__DEBUG__ -D__FSKIT_NEWFS__ -D__HAVE_HCORE_APIS__ -D__HCORE__ -I../ -I./ -I$(HOME)/ ASM = nasm ASMFLAGS = -f win64 LDFLAGS = -e Main -shared --subsystem=17 -- cgit v1.2.3