From 9298aef87ea2e5b80d2ecbf1fbc42e2d73ca96ab Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken91@gmail.com>
Date: Tue, 23 Sep 2025 19:06:18 +0200
Subject: [PATCH] Separate boolean definition for C and C++

---
 sdk/xtdk/xtcompat.h | 16 ++++++++++++++--
 sdk/xtdk/xtstruct.h |  1 -
 sdk/xtdk/xttypes.h  |  7 -------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sdk/xtdk/xtcompat.h b/sdk/xtdk/xtcompat.h
index 9d8c427..27544d5 100644
--- a/sdk/xtdk/xtcompat.h
+++ b/sdk/xtdk/xtcompat.h
@@ -15,14 +15,26 @@
     #define XTCLINK         extern "C"
     #define NULLPTR         nullptr
 
-    /* C++ types */
+    /* C++ boolean type */
+    typedef bool BOOLEAN, *PBOOLEAN;
+    #define TRUE true
+    #define FALSE false
+
+    /* C++ widechar type */
     typedef wchar_t wchar;
 #else
     /* C definitions */
     #define XTCLINK
     #define NULLPTR         ((void *)0)
 
-    /* C types */
+    /* C boolean type */
+    typedef enum _BOOLEAN
+    {
+        FALSE = 0,
+        TRUE = 1
+    } BOOLEAN, *PBOOLEAN;
+
+    /* C widechar type */
     typedef unsigned short wchar;
 #endif
 
diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index 9cda478..62fa2f8 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -14,7 +14,6 @@
 
 /* Enumeration lists forward references */
 typedef enum _ADJUST_REASON ADJUST_REASON, *PADJUST_REASON;
-typedef enum _BOOLEAN BOOLEAN, *PBOOLEAN;
 typedef enum _EXCEPTION_DISPOSITION EXCEPTION_DISPOSITION, *PEXCEPTION_DISPOSITION;
 typedef enum _EFI_ALLOCATE_TYPE EFI_ALLOCATE_TYPE, *PEFI_ALLOCATE_TYPE;
 typedef enum _EFI_FRAMEWORK_CPU_DESIGNATION EFI_FRAMEWORK_CPU_DESIGNATION, *PEFI_FRAMEWORK_CPU_DESIGNATION;
diff --git a/sdk/xtdk/xttypes.h b/sdk/xtdk/xttypes.h
index 2e06866..5d994b7 100644
--- a/sdk/xtdk/xttypes.h
+++ b/sdk/xtdk/xttypes.h
@@ -150,13 +150,6 @@ typedef LPCWSTR PCTSTR, LPCTSTR;
 typedef LPUWSTR PUTSTR, LPUTSTR;
 typedef LPCUWSTR PCUTSTR, LPCUTSTR;
 
-/* Boolean type */
-typedef enum _BOOLEAN
-{
-    FALSE = 0,
-    TRUE = 1
-} BOOLEAN, *PBOOLEAN;
-
 /* 128-bit floats structure */
 typedef struct _FLOAT128
 {