diff options
Diffstat (limited to 'dev/ZKA/KernelKit')
| -rw-r--r-- | dev/ZKA/KernelKit/CodeManager.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/FileManager.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PEFCodeManager.hxx | 13 |
3 files changed, 11 insertions, 6 deletions
diff --git a/dev/ZKA/KernelKit/CodeManager.hxx b/dev/ZKA/KernelKit/CodeManager.hxx index b551815e..513e65b7 100644 --- a/dev/ZKA/KernelKit/CodeManager.hxx +++ b/dev/ZKA/KernelKit/CodeManager.hxx @@ -27,5 +27,5 @@ namespace Kernel /// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible. /// @param main the start of the process. /// @return if the process was started or not. - bool execute_from_image(MainKind main, const Char* processName) noexcept; + bool execute_from_image(MainKind main, const Char* process_name) noexcept; } // namespace Kernel diff --git a/dev/ZKA/KernelKit/FileManager.hxx b/dev/ZKA/KernelKit/FileManager.hxx index 67f2f501..cbfc1e30 100644 --- a/dev/ZKA/KernelKit/FileManager.hxx +++ b/dev/ZKA/KernelKit/FileManager.hxx @@ -188,7 +188,7 @@ namespace Kernel * @tparam Encoding file encoding (char, wchar_t...) * @tparam FSClass Filesystem contract who takes care of it. */ - template <typename Encoding = char, + template <typename Encoding = Char, typename FSClass = FilesystemManagerInterface> class FileStream final { diff --git a/dev/ZKA/KernelKit/PEFCodeManager.hxx b/dev/ZKA/KernelKit/PEFCodeManager.hxx index 2935f709..dd6daca5 100644 --- a/dev/ZKA/KernelKit/PEFCodeManager.hxx +++ b/dev/ZKA/KernelKit/PEFCodeManager.hxx @@ -46,11 +46,16 @@ namespace Kernel bool IsLoaded() noexcept; private: +#ifdef __FSKIT_USE_NEWFS__ + OwnPtr<FileStream<Char, NewFilesystemManager>> fFile; +#else OwnPtr<FileStream<Char>> fFile; - Ref<StringView> fPath; - VoidPtr fCachedBlob; - bool fFatBinary; - bool fBad; +#endif // __FSKIT_USE_NEWFS__ + + Ref<StringView> fPath; + VoidPtr fCachedBlob; + bool fFatBinary; + bool fBad; }; namespace Utils |