From 58ec3282634ccf75006043017ceacffed9a4533c Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Date: Fri, 23 Aug 2024 15:26:33 +0200
Subject: [IMP] BootScr module, manage boot driver (TODO need a UI toolkit for
 it) [IMP] Made NetBoot compilable as well. [IMP] Fix Thread loader to be able
 to load other executables. [REFACTOR] __NEWOS_ to __ZKA_ refactor. [WIP]
 Fixing catalog which can't be fetched again after being written.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
---
 dev/ZKA/Sources/CxxAbi-AMD64.cxx   | 4 ++--
 dev/ZKA/Sources/PEFCodeManager.cxx | 2 +-
 dev/ZKA/Sources/PageManager.cxx    | 4 ++--
 dev/ZKA/Sources/Pmm.cxx            | 4 ++--
 dev/ZKA/Sources/compile_flags.txt  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'dev/ZKA/Sources')

diff --git a/dev/ZKA/Sources/CxxAbi-AMD64.cxx b/dev/ZKA/Sources/CxxAbi-AMD64.cxx
index 5514336e..66fae2f5 100644
--- a/dev/ZKA/Sources/CxxAbi-AMD64.cxx
+++ b/dev/ZKA/Sources/CxxAbi-AMD64.cxx
@@ -4,7 +4,7 @@
 
 ------------------------------------------- */
 
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
 
 #include <KernelKit/DebugOutput.hxx>
 #include <NewKit/CxxAbi.hxx>
@@ -88,4 +88,4 @@ namespace cxxabiv1
 	}
 } // namespace cxxabiv1
 
-#endif // ifdef __NEWOS_AMD64__
+#endif // ifdef __ZKA_AMD64__
diff --git a/dev/ZKA/Sources/PEFCodeManager.cxx b/dev/ZKA/Sources/PEFCodeManager.cxx
index 746b75eb..4a729992 100644
--- a/dev/ZKA/Sources/PEFCodeManager.cxx
+++ b/dev/ZKA/Sources/PEFCodeManager.cxx
@@ -24,7 +24,7 @@ namespace Kernel
 			return kPefArch32x0;
 #elif defined(__NEWOS_64X0__)
 			return kPefArch64x0;
-#elif defined(__NEWOS_AMD64__)
+#elif defined(__ZKA_AMD64__)
 			return kPefArchAMD64;
 #elif defined(__NEWOS_PPC64__)
 			return kPefArchPowerPC;
diff --git a/dev/ZKA/Sources/PageManager.cxx b/dev/ZKA/Sources/PageManager.cxx
index 868a9f7a..77dbfd32 100644
--- a/dev/ZKA/Sources/PageManager.cxx
+++ b/dev/ZKA/Sources/PageManager.cxx
@@ -7,11 +7,11 @@
 #include <KernelKit/DebugOutput.hxx>
 #include <NewKit/PageManager.hxx>
 
-#ifdef __NEWOS_AMD64__
+#ifdef __ZKA_AMD64__
 #include <HALKit/AMD64/HalPageAlloc.hxx>
 #elif defined(__NEWOS_ARM64__)
 #include <HALKit/ARM64/HalPageAlloc.hxx>
-#endif // ifdef __NEWOS_AMD64__ || defined(__NEWOS_ARM64__)
+#endif // ifdef __ZKA_AMD64__ || defined(__NEWOS_ARM64__)
 
 //! null deref will throw (Page Zero detected, aborting app!)
 #define kProtectedRegionEnd (512)
diff --git a/dev/ZKA/Sources/Pmm.cxx b/dev/ZKA/Sources/Pmm.cxx
index 4a511c30..62015f41 100644
--- a/dev/ZKA/Sources/Pmm.cxx
+++ b/dev/ZKA/Sources/Pmm.cxx
@@ -11,9 +11,9 @@
 #include <HALKit/ARM64/Processor.hxx>
 #endif // defined(__NEWOS_ARM64__)
 
-#if defined(__NEWOS_AMD64__)
+#if defined(__ZKA_AMD64__)
 #include <HALKit/AMD64/Processor.hxx>
-#endif // defined(__NEWOS_AMD64__)
+#endif // defined(__ZKA_AMD64__)
 
 namespace Kernel
 {
diff --git a/dev/ZKA/Sources/compile_flags.txt b/dev/ZKA/Sources/compile_flags.txt
index b02c5e3d..33aadad4 100644
--- a/dev/ZKA/Sources/compile_flags.txt
+++ b/dev/ZKA/Sources/compile_flags.txt
@@ -4,4 +4,4 @@
 -I../
 -I$(HOME)/
 -D__FSKIT_USE_NEWFS__
--D__NEWOS_AMD64__
+-D__ZKA_AMD64__
-- 
cgit v1.2.3