diff options
| -rw-r--r-- | dev/ZKAKit/HALKit/AMD64/HalKernelMain.cc | 4 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelKit/CodeMgr.h | 6 | ||||
| -rw-r--r-- | dev/ZKAKit/src/CodeMgr.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dev/ZKAKit/HALKit/AMD64/HalKernelMain.cc b/dev/ZKAKit/HALKit/AMD64/HalKernelMain.cc index cb3941ba..d68c0541 100644 --- a/dev/ZKAKit/HALKit/AMD64/HalKernelMain.cc +++ b/dev/ZKAKit/HALKit/AMD64/HalKernelMain.cc @@ -18,7 +18,7 @@ EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; EXTERN_C Kernel::VoidPtr mp_user_switch_proc; EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; -EXTERN_C Kernel::MainKind __CTOR_LIST__[]; +EXTERN_C Kernel::rtl_main_kind __CTOR_LIST__[]; EXTERN_C Kernel::VoidPtr __DTOR_LIST__; EXTERN_C Kernel::Void gsh_dll_main(Kernel::Void); @@ -27,7 +27,7 @@ STATIC Kernel::Void hal_init_cxx_ctors() { for (Kernel::SizeT index = 0UL; __CTOR_LIST__[index] != __DTOR_LIST__; ++index) { - Kernel::MainKind constructor_cxx = (Kernel::MainKind)__CTOR_LIST__[index]; + Kernel::rtl_main_kind constructor_cxx = (Kernel::rtl_main_kind)__CTOR_LIST__[index]; constructor_cxx(); } } diff --git a/dev/ZKAKit/KernelKit/CodeMgr.h b/dev/ZKAKit/KernelKit/CodeMgr.h index 1915d55d..1db51449 100644 --- a/dev/ZKAKit/KernelKit/CodeMgr.h +++ b/dev/ZKAKit/KernelKit/CodeMgr.h @@ -3,7 +3,7 @@ Copyright (C) 2024, Theater Quality Inc, all rights reserved. File: CodeMgr.hpp - Purpose: Code Mgr and DLL mgr. + Purpose: Code Mgr. Revision History: @@ -21,11 +21,11 @@ namespace Kernel { /// @brief Main process entrypoint. - typedef void (*MainKind)(void); + typedef void (*rtl_main_kind)(void); /// @brief Executes a new process from a function. Kernel code only. /// @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 The team's process id. - ProcessID rtl_create_process(MainKind main, const Char* process_name) noexcept; + ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept; } // namespace Kernel diff --git a/dev/ZKAKit/src/CodeMgr.cc b/dev/ZKAKit/src/CodeMgr.cc index 43f7fe18..0450f56a 100644 --- a/dev/ZKAKit/src/CodeMgr.cc +++ b/dev/ZKAKit/src/CodeMgr.cc @@ -14,7 +14,7 @@ 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. - ProcessID rtl_create_process(MainKind main, const Char* process_name) noexcept + ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept { if (*process_name == 0) return kProcessInvalidID; |