Skip to content
This repository was archived by the owner on Mar 9, 2026. It is now read-only.

Commit 8543777

Browse files
grom72StevenPontsler
authored andcommitted
common: update patch for Base.h file
patch modification to follow changes in Base.h imported from edk2 fixes: #119 Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>
1 parent ca8f6a4 commit 8543777

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/os/patches/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,25 @@ diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
55
index 2da08b0c78..072eefdb94 100644
66
--- a/MdePkg/Include/Base.h
77
+++ b/MdePkg/Include/Base.h
8-
@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
8+
@@ -309,6 +309,8 @@ struct _LIST_ENTRY {
99
///
1010
/// NULL pointer (VOID *)
1111
///
1212
+#ifndef OS_BUILD
1313
+#ifndef UNIT_TEST_UEFI_BUILD
14+
#if defined (__cplusplus)
15+
#if defined (_MSC_EXTENSIONS)
16+
#define NULL nullptr
17+
@@ -318,6 +320,8 @@ struct _LIST_ENTRY {
18+
#else
1419
#define NULL ((VOID *) 0)
20+
#endif
1521
+#endif
1622
+#endif
17-
23+
1824
//
1925
// Null character
20-
@@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST;
26+
@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
2127
// Section 2.3.1 of the UEFI 2.3 Specification.
2228
//
2329

@@ -26,7 +32,7 @@ index 2da08b0c78..072eefdb94 100644
2632
STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
2733
STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
2834
STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
29-
@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi
35+
@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi
3036
STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
3137
STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
3238
STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
@@ -35,7 +41,7 @@ index 2da08b0c78..072eefdb94 100644
3541

3642
//
3743
// The following three enum types are used to verify that the compiler
38-
@@ -843,9 +851,13 @@ typedef enum {
44+
@@ -812,9 +820,13 @@ typedef enum {
3945
__VerifyUint32EnumValue = 0xffffffff
4046
} __VERIFY_UINT32_ENUM_SIZE;
4147

@@ -49,5 +55,3 @@ index 2da08b0c78..072eefdb94 100644
4955

5056
/**
5157
Macro that returns a pointer to the data structure that contains a specified field of
52-
--
53-
2.31.0.windows.1

0 commit comments

Comments
 (0)