diff options
| author | Peter Jones <pjones@redhat.com> | 2017-10-23 15:25:14 -0400 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2018-03-12 16:21:43 -0400 |
| commit | 7ee19bdc41d2209fbe25d2e4be812245b94b5457 (patch) | |
| tree | b10f190d0d7e5a37c2e36070a097160ecfa05fe3 /include | |
| parent | ca1d0534faa9382ce09641c4e697223a47851a8f (diff) | |
| download | efi-boot-shim-7ee19bdc41d2209fbe25d2e4be812245b94b5457.tar.gz efi-boot-shim-7ee19bdc41d2209fbe25d2e4be812245b94b5457.zip | |
Use gcc's offsetof() instead of hacking out our own.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/efiauthenticated.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h index a9c395f6..7157ffd2 100644 --- a/include/efiauthenticated.h +++ b/include/efiauthenticated.h @@ -119,8 +119,6 @@ typedef struct { //UINT8 Signature[]; } WIN_CERTIFICATE_EFI_PKCS1_15; -#define OFFSET_OF(TYPE, Field) ((UINTN) &(((TYPE *)0)->Field)) - /* * Attributes of Authenticated Variable */ @@ -182,14 +180,14 @@ typedef struct { /* * Size of AuthInfo prior to the data payload. */ -#define AUTHINFO_SIZE ((OFFSET_OF (EFI_VARIABLE_AUTHENTICATION, AuthInfo)) + \ - (OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData)) + \ +#define AUTHINFO_SIZE ((offsetof(EFI_VARIABLE_AUTHENTICATION, AuthInfo)) + \ + (offsetof(WIN_CERTIFICATE_UEFI_GUID, CertData)) + \ sizeof (EFI_CERT_BLOCK_RSA_2048_SHA256)) -#define AUTHINFO2_SIZE(VarAuth2) ((OFFSET_OF (EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) + \ +#define AUTHINFO2_SIZE(VarAuth2) ((offsetof(EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) + \ (UINTN) ((EFI_VARIABLE_AUTHENTICATION_2 *) (VarAuth2))->AuthInfo.Hdr.dwLength) -#define OFFSET_OF_AUTHINFO2_CERT_DATA ((OFFSET_OF (EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) + \ - (OFFSET_OF (WIN_CERTIFICATE_UEFI_GUID, CertData))) +#define OFFSET_OF_AUTHINFO2_CERT_DATA ((offsetof(EFI_VARIABLE_AUTHENTICATION_2, AuthInfo)) + \ + (offsetof(WIN_CERTIFICATE_UEFI_GUID, CertData))) #endif /* SHIM_EFIAUTHENTICATED_H */ |