From 6411fc3ae9bd7ec305c41a53e047513454e164fe Mon Sep 17 00:00:00 2001
From: belliash <belliash@codingworkshop.eu.org>
Date: Sat, 11 Feb 2023 12:41:00 +0100
Subject: [PATCH] Simplify single linked list header

---
 sdk/xtdk/xtbase.h   | 16 ++++------------
 sdk/xtdk/xtstruct.h |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/sdk/xtdk/xtbase.h b/sdk/xtdk/xtbase.h
index 2ba6a54..e959861 100644
--- a/sdk/xtdk/xtbase.h
+++ b/sdk/xtdk/xtbase.h
@@ -57,19 +57,11 @@ typedef struct _SINGLE_LIST_ENTRY
 } SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
 
 /* Header for a sequenced single linked list union definition */
-typedef union _SINGLE_LIST_HEADER
+typedef struct _SINGLE_LIST_HEADER
 {
-    ULONGLONG Alignment;
-    union
-    {
-        struct
-        {
-            SINGLE_LIST_ENTRY Next;
-            USHORT Depth;
-            USHORT Sequence;
-        };
-        ULONGLONG Region;
-    };
+    SINGLE_LIST_ENTRY Next;
+    USHORT Depth;
+    USHORT Sequence;
 } SINGLE_LIST_HEADER, *PSINGLE_LIST_HEADER;
 
 /* 128-bit 16-byte aligned XMM register */
diff --git a/sdk/xtdk/xtstruct.h b/sdk/xtdk/xtstruct.h
index 7bb4924..c4b813b 100644
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -226,6 +226,7 @@ typedef struct _PECOFF_IMAGE_ROM_OPTIONAL_HEADER PECOFF_IMAGE_ROM_OPTIONAL_HEADE
 typedef struct _PECOFF_IMAGE_SECTION_HEADER PECOFF_IMAGE_SECTION_HEADER, *PPECOFF_IMAGE_SECTION_HEADER;
 typedef struct _PECOFF_IMAGE_VXD_HEADER PECOFF_IMAGE_VXD_HEADER, *PPECOFF_IMAGE_VXD_HEADER;
 typedef struct _SINGLE_LIST_ENTRY SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY;
+typedef struct _SINGLE_LIST_HEADER SINGLE_LIST_HEADER, *PSINGLE_LIST_HEADER;
 typedef struct _STRING STRING, *PSTRING;
 typedef struct _STRING32 STRING32, *PSTRING32;
 typedef struct _STRING64 STRING64, *PSTRING64;
@@ -243,6 +244,5 @@ typedef union _EFI_IP_ADDRESS EFI_IP_ADDRESS, *PEFI_IP_ADDRESS;
 typedef union _EFI_PXE_BASE_CODE_PACKET EFI_PXE_BASE_CODE_PACKET, *PEFI_PXE_BASE_CODE_PACKET;
 typedef union _LARGE_INTEGER LARGE_INTEGER, *PLARGE_INTEGER;
 typedef union _ULARGE_INTEGER ULARGE_INTEGER, *PULARGE_INTEGER;
-typedef union _SINGLE_LIST_HEADER SINGLE_LIST_HEADER, *PSINGLE_LIST_HEADER;
 
 #endif /* __XTDK_XTSTRUCT_H */