Date: Thu, 1 May 2025 18:06:40 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 915b2336b1c4 - main - libefi: Update to use the efi_guid_t from sys/efi.h Message-ID: <202505011806.541I6eRG066638@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=915b2336b1c428537a6ccaed1b7e60a39adf7b66 commit 915b2336b1c428537a6ccaed1b7e60a39adf7b66 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-05-01 17:53:36 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-05-01 17:53:36 +0000 libefi: Update to use the efi_guid_t from sys/efi.h Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D50038 --- lib/libefivar/efivar.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h index 7551205fda38..980f261e9edc 100644 --- a/lib/libefivar/efivar.h +++ b/lib/libefivar/efivar.h @@ -46,19 +46,14 @@ #endif -#ifndef _EFIVAR_EFI_GUID_T_DEF -#define _EFIVAR_EFI_GUID_T_DEF -typedef uuid_t efi_guid_t; -#endif - #if BYTE_ORDER == LITTLE_ENDIAN #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) >> 8, (d) & 0xff, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) >> 8, (d) & 0xff, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #else #define EFI_GUID(a, b, c, d, e0, e1, e2, e3, e4, e5) \ - ((efi_guid_t) {(a), (b), (c), (d) & 0xff, (d) >> 8, \ - { (e0), (e1), (e2), (e3), (e4), (e5) }}) + ((efi_guid_t) {(a), (b), (c), { (d) & 0xff, (d) >> 8, \ + (e0), (e1), (e2), (e3), (e4), (e5) }}) #endif #define EFI_GLOBAL_GUID EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, 0xaa0d, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505011806.541I6eRG066638>