diff options
| author | Warner Losh <imp@FreeBSD.org> | 2025-04-23 18:02:54 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2025-04-23 18:02:54 +0000 |
| commit | 8f6bda97a4734bec74d5787766b177112dc8a3f5 (patch) | |
| tree | 36b30c90ce307f59ff198416fe65bb1c405e68f3 /MdePkg/Include/Base.h | |
| parent | 5d8674f2bdd536124b1dd026dfa729a1376b3cac (diff) | |
Import edk2 edk2-stable202502 (hash fbe0805b2091393406952e84724188f8c1941837)vendor/edk2/edk2-stable202502vendor/edk2
Bring in the latest stable branch for updated defines (especailly
Loongson). Remove ^M as described in sys/contrib/edk2/FREEBSD-upgrade.
Not the absolute latest, but aligned to the edk2-stable202502 tag.
Sponsored by: Netflix
Diffstat (limited to 'MdePkg/Include/Base.h')
| -rw-r--r-- | MdePkg/Include/Base.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 72bf6f31366a..6989b10f9e0b 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -800,12 +800,12 @@ typedef UINTN *BASE_LIST; @param Message Raised compiler diagnostic message when expression is false. **/ -#ifdef MDE_CPU_EBC -#define STATIC_ASSERT(Expression, Message) -#elif defined (_MSC_EXTENSIONS) || defined (__cplusplus) +#if defined (__cplusplus) #define STATIC_ASSERT static_assert -#else +#elif defined (__GNUC__) || defined (__clang__) #define STATIC_ASSERT _Static_assert +#elif defined (_MSC_EXTENSIONS) +#define STATIC_ASSERT static_assert #endif // @@ -888,7 +888,7 @@ STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM @return A pointer to the structure from one of it's elements. **/ -#define BASE_CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - OFFSET_OF (TYPE, Field))) +#define BASE_CR(Record, TYPE, Field) ((TYPE *) (VOID *) ((CHAR8 *) (Record) - OFFSET_OF (TYPE, Field))) /** Checks whether a value is a power of two. |